From nobody Tue Jan 13 17:48:04 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4drGtX6Td5z6NTMv for ; Tue, 13 Jan 2026 17:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drGtX5dyfz3pjP for ; Tue, 13 Jan 2026 17:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768326484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58wlVve3cvJoNT9Tdxv542xSpUpkPz2RlhnJc25ib6c=; b=AwmEd57RXA4ARO7N+2Ns9uar7KYKwF77OD+/qGEbpMRiNeeV8843Qs1VGnSC2oqnqsB3oj xcNGhsljg1nTHOwcTq3wcXuLWiavHOmTjdCHuPZS//qYCu3I7osbeFakKOadCwNS+8JF+a sfZp9CiBNSc+est0iPFmYfAMH3LngwJ6glPtuAOISBXadOtqyxmhwahxcoSMvoisHLNFfQ 0DM5zQRmoTbQ3nDTaRex1ILdlMOw9azYc5xtKz/mM5o7pRyGIu5gCOROtgC3CMvP8oSuLj bt7LFmMcCF2vjDaPXUi/J8DNXRyXRHtDCci6rfXbymw+Q7FOlYlo6/SeBVUa2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768326484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58wlVve3cvJoNT9Tdxv542xSpUpkPz2RlhnJc25ib6c=; b=lAlvVZcV5wWfLztTcv18w0Xl6O+/D3hQbQ0JzM7EOY12aN1V2FJuKTCppZuqi4KkLC23hO Z/bkitwqD8ZsmgYPgok18j7GyqsAbm83FTFIUOeMeNqcNTNWRHQaN9iDlSDA7C5HutAMYZ 5VJ7VXhyTkrjyoX9K3230MYYO24H1TbI6T8uXoDMOxyt+62AQVl990+vUl4g+uj7VNjieM nGjb9lnaasGJl4SQ/JXQ6Nhxak4uMvTCa4B12sm5wmopxg9B6Ixg6VD5R+AT8PmikOqe7U yuhh6glIJrz0XWD6IBolfwIOIJMxJfwUHUrzwpxJQVzLOnMYdK8vzfBgbkwSGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768326484; a=rsa-sha256; cv=none; b=ngdQigI9DquXS+SGU8q7JZC//+whLIWMLnAvBFyXIfNnuPp6PaPqYXNsW24ga6cE3iuo8W ckOsmlPWFMc1X9N6NpO+85MZH7nX20sdYzLN8BIXv0wx8AYtbLXVxTyLj705LF/A/nTYOM UdApt1+/nmzWi7DIyinojZJ2PzWTt6BixUyn7a0wB5K58gLwQJF7N+19tr6Po2QNjyam2o 9qXbCjP1fSVSTAPki70F95TyxhMFuU3Mqqcs2WOjWRd3a8d6l4ZUedFpB0aO/vxsWhiADz emdcwFf9xTSIozk1rsOtJZUHhlMXMLcNpG41ApPbnF6fa9gTcwhu45DiBSj17A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4drGtX58LCz6xL for ; Tue, 13 Jan 2026 17:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37ac9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 17:48:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: efa78078be9d - stable/15 - stand: Try to parse vdisk correctly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: efa78078be9dceb19655cf6dc4f400b1db940cc5 Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 17:48:04 +0000 Message-Id: <69668554.37ac9.492e774a@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=efa78078be9dceb19655cf6dc4f400b1db940cc5 commit efa78078be9dceb19655cf6dc4f400b1db940cc5 Author: Warner Losh AuthorDate: 2025-11-11 00:41:52 +0000 Commit: Warner Losh CommitDate: 2026-01-13 17:28:56 +0000 stand: Try to parse vdisk correctly PR: 289306 Sponsored by: Netflix Reviewed by: dab MFC After: 5 days Differential Revision: https://reviews.freebsd.org/D52500 (cherry picked from commit d18ed8e19c3cb264340987bdc191615108d8413a) --- stand/common/disk.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/stand/common/disk.c b/stand/common/disk.c index c1650f0fa1ec..47f882d5a532 100644 --- a/stand/common/disk.c +++ b/stand/common/disk.c @@ -417,7 +417,18 @@ disk_parsedev(struct devdesc **idev, const char *devspec, const char **path) char *cp; struct disk_devdesc *dev; - np = devspec + 4; /* Skip the leading 'disk' */ + /* + * disk names look approximately like: + * v?disk([0-9]+(p[0-9]+|s[a-z])?)?: + * so skip over the initial bit. We don't have access to the devsw + * to check the name. + */ + if (strncmp(devspec, "disk", 4) == 0) + np = devspec + 4; + else if (strncmp(devspec, "vdisk", 5) == 0) + np = devspec + 5; + else + return (EINVAL); unit = -1; /* * If there is path/file info after the device info, then any missing