From nobody Tue Jan 24 22:11:56 2023 X-Original-To: dev-commits-src-all@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 4P1h5n3Svsz3bfd5; Tue, 24 Jan 2023 22:11:57 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h5m5F6Qz4Q5G; Tue, 24 Jan 2023 22:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598316; 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=TYGYsN3dS4fDZcgYOoG3K6J+G8NHt4V8yLAV1KqMEL0=; b=m70PAFGlIktr83nGTpYv0EkFXYDDF+o1UgHslvnhr/SE+uPMg08fNf28Hz+AnhLyuP7dov 5LR5vdL8vmiDs982stdLpoVuJN2alHEYFo3m7kossASg5E045xvRoUlAHcR3Mqnvxs6oUh y+tXV/+JWtjzTuNoPsFB8qQDD4EvrBR5s+VaOxl1O1LPCjGxg2HLYn55JRXa3LEjOCzHpZ fUlUnirkzvvLyQTuYDRSeBiKuQ4oQ1CF86U96X1sUZEwtfvPTlXOxNCDUM9H4iRq8BnEze u3OaRWC80eOx+ydb2ihFsF145XVgjOE0nSY5LuTJtMV7QF8cCxNBavFN4S9klg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598316; 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=TYGYsN3dS4fDZcgYOoG3K6J+G8NHt4V8yLAV1KqMEL0=; b=d33BbSoeItp/qr27ShVBliHGrK+hSJa3igjI375CKMBPsVmvPa/hTpJc44CP2B9nNZAdTG gUMql3vLZsrFESJIm6yHGl0DdLl6vROIJcDbYKjT4iFLdVeop355/wcjFy+H1yjG4lTOlc kDOldnIISqCLFz2hXl2nTsTnPcyW56N39A9j57KhjDaojeQ1cWMYjY+6nWylrMgp208iBM fe4BhE9FylMo84k6+80dkA1EIMeWgi39D/1mk+mNcQE3EBkW3w6b2eFUy7mtK3faUY9f8D caSD7m95XjfQwlJZer39/e3eAXSDMb/BTh3ako7Ni/AlqOPVx21SWGgF/Ai/Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598316; a=rsa-sha256; cv=none; b=n6GX8RY3A+rj9smSPRSyc1DIAE6A99TZt1tlwHarPqdzsXo/Xmaow2OHYlCoy6FIRU3Vps 50Y12K0G4LXIAPeYIfeGJFQWX7jU/Jmc6FMWSHdo/vDDuGms9LjTcPKvJdWxtVpHUQy2i4 u2d1YwgwYjz11SizjUCyvb/rVYxUJGQuQWQ3FeYmAfo6WJTaxYnt3R24Lifzx8JW5DcM5+ PXYIbd9IZQyhcH6QOJQsKCDB8S0PJiZBttQYIxw2jKfcjmCy4raa2qO/d2DtWhtaiOzmAU 8Z2aoU+NASYRh4wgOTV+JAVDZn5e+v/EaMZGi8eYm05W9CobTIEpYdNkupvPOw== 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 4P1h5m3fjrzQf1; Tue, 24 Jan 2023 22:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMBuxj085399; Tue, 24 Jan 2023 22:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMBu3Y085398; Tue, 24 Jan 2023 22:11:56 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:56 GMT Message-Id: <202301242211.30OMBu3Y085398@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 08939ccadc25 - stable/13 - stand: Add devformat to return formatted string for a device List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 08939ccadc253933d6cbff55f6d9b1b82707bc8e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=08939ccadc253933d6cbff55f6d9b1b82707bc8e commit 08939ccadc253933d6cbff55f6d9b1b82707bc8e Author: Warner Losh AuthorDate: 2022-08-11 15:06:09 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:30 +0000 stand: Add devformat to return formatted string for a device Use dv_fmtdev to return a formatted string for a device. If this is a null pointer, return the device name and unit followed by a colon (eg disk3:). Sponsored by: Netflix Reviewed by: tsoome (prior version) Differential Revision: https://reviews.freebsd.org/D35916 (cherry picked from commit dc472f67021320309ced970d3d26d30a04da0ef2) --- stand/libsa/dev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/stand/libsa/dev.c b/stand/libsa/dev.c index 1d1dd075580e..2ccdce22d596 100644 --- a/stand/libsa/dev.c +++ b/stand/libsa/dev.c @@ -56,3 +56,14 @@ noioctl(struct open_file *f __unused, u_long cmd __unused, void *data __unused) { return (EINVAL); } + +char * +devformat(struct devdesc *d) +{ + static char name[DEV_DEVLEN]; + + if (d->d_dev->dv_fmtdev != NULL) + return (d->d_dev->dv_fmtdev(d)); + snprintf(name, sizeof(name), "%s%d:", d->d_dev->dv_name, d->d_unit); + return (name); +}