From nobody Tue Nov 11 00:56:31 2025 X-Original-To: dev-commits-src-main@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 4d57QR2Gb6z64GLq; Tue, 11 Nov 2025 00:56:31 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d57QR1bXMz3HW4; Tue, 11 Nov 2025 00:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762822591; 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=DS3L0zTmY/lJUmMmSBUmb3vv9WEm+Gisx2oeuOuRSOs=; b=ijKsFRHfQiStRyo0wzcxG4gjIkRI/pgkuMKxg9T3er4o2y9gYhu5qnt2ImoU4+NA/gK9WO smgxBGrYjxf70ua6qQ3tXLZXrTOIFkNuRZQmgPtrGW0aGURb049Uc2ChCtmSBm/bvxGkAr 2DImh2eA6tYrewJXSXkjLpJXjTvT5Co4FKQqdg87Vd6tbyQy9HLbGMK2cB7xkSwHNr8yKG gxHpF+/xDXBRNuQS7hKaPJDo5SfSWcRd8LlLV6WZd4CC4yg5h3cD2XDYf8XYMJWrdYB4ch pOhpl3JxEFF3az+mx/n+JjYKPKl0KLZza5iiGzA6Vs4FVTfwTBH4ZmTnQj+SpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762822591; 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=DS3L0zTmY/lJUmMmSBUmb3vv9WEm+Gisx2oeuOuRSOs=; b=CGZHOdDfJbq0OLwB6q5l0sYCXVEyTXv3LdDucG3ah7JijK+8GxESHIhrovKDMc3vb0hTRD V+0CU9Pmt1zIs9E+55jBXOUxcntHOs4cMpd3tLRhNANiahUGE4DVVtC/EcCwC3UI5eE52+ XKX9z7Za9vsI85GQJF9kJTxKtx6BRKjSs6a4Amev0fRShwdCp2WOrQ6CYHlKe7q41F/4d4 f2+f6a/spWZ+LGuO/Dtjwn0mBLCPKYbRg2EW5j2UhKCde+DDsEGJQSWkhYijU6wgykz/1Z ooqU7K1ORNIGO0DTXUJqTt3X5XDobpm3jvw1ntxdFqMXzhG95c11p7xTpe03wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762822591; a=rsa-sha256; cv=none; b=hsBT3hFFZyEraYTLlGNGX4Nt43I9hIGX5IHai5IFglH17jp3pj94Csfi0DMnUwhsVorxxJ hxQuSzey9s3NvvB+Xmcga49FGvPxYfQHr6TyRs1xqMCuYB6JnUa/LSyvAtDpkdFHLBx6k5 AQCRiszBL/U+kWm3nF4Y+L1Pb0Jz2GuC5VXKd8+i+HQx0rUG9vTSkgkmglhVB7gT2LtHFM IywHOIfEN0C2/rvMRGLB48BVEdpyNnGJdaHkxmdEOi/x+Nt1cUJ0NMiuxNNDZHRTbsOpXJ HYwB8y0GWPbaLbJP20fVfPZ4M9Mh+3S0Wmi9yhbSG7RayZYsMVu6HWEAsozG1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d57QR16Y4zj9y; Tue, 11 Nov 2025 00:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AB0uVZc071666; Tue, 11 Nov 2025 00:56:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AB0uV1e071663; Tue, 11 Nov 2025 00:56:31 GMT (envelope-from git) Date: Tue, 11 Nov 2025 00:56:31 GMT Message-Id: <202511110056.5AB0uV1e071663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d18ed8e19c3c - main - stand: Try to parse vdisk correctly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d18ed8e19c3cb264340987bdc191615108d8413a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d18ed8e19c3cb264340987bdc191615108d8413a commit d18ed8e19c3cb264340987bdc191615108d8413a Author: Warner Losh AuthorDate: 2025-11-11 00:41:52 +0000 Commit: Warner Losh CommitDate: 2025-11-11 00:56:11 +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 --- 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