From nobody Tue Jan 24 22:13:26 2023 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 4P1h7W1D65z3bgPM; Tue, 24 Jan 2023 22:13:27 +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 4P1h7V70bgz3Gsd; Tue, 24 Jan 2023 22:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598407; 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=IO/UdmbgbECH/tVWIBMDIt/85QZPxQ0n/Hlefg3D04w=; b=oJ4EgnJsnK7LZdHLYg+doT+1zF7f5+t0yQ67OtnP+br7nS1YZZigGPZAgrFKfs9y+yApYg H/3KsLshul2BHbDmTjt4MVhTH13v1XTW1hfQIPpP5865Hc5xOAv/GvX82/ifoVJjCghgez pVW11sth3zzBsqD/uPAvceiNW7ofCfzXgeFxp9tELT/VNTepefc4tIhtyZ0RgLtSZbNpAN KIb7H7SeSqQAUfUJM8Be1TKhVmwTt3SQDo9WwuF9TkchTPVu+00xj8rzvEQZPgqiyd6pQC l0P8NCK4zdFI/TnZjtq1ikilL9K5q9IuyFrBZd/OFS9MJsPeMxmZQYRwb+fNjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598407; 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=IO/UdmbgbECH/tVWIBMDIt/85QZPxQ0n/Hlefg3D04w=; b=oIRJ5TY7eVohH6PDGypINn8ZvMmgfkxRdhhBqUp5wJtt/EiZc4Gv/6IE67yKwEympYBJU3 ZzDA2Vb2M5MctBelVfHcWjAIda1YLSiiUd7sRepqADdgquPSSLVTHKUoZDKJvBqmKbfLYr A8++ejX2b+4Sf7u4g+nfvIsoESVDxVWwrJMhOPMKqdWLkrejjzO7dB6b8b8rW/TUNPqJAZ 6jTHRG5j1a3C1lku9sAuHr/A2TosCdUidfwmpTwgnJZtFLm3J65JfQ5F6HuVZASOKUTQ4v /sr+SxR/Ou/neOyRecsZUaJrjTIllEsrVbTqLy9JuOA7rzhnpDwfxb9z6THI8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598407; a=rsa-sha256; cv=none; b=Km1PxW4QFBIzSjnUWgFtCeErO405ymhaDs3DGJbzfvOlEqa9+SXmbnhpJbyvaCQ6yifR0U qCycM5GkyGHEtw1AC9Osic0HFW77dEV+bImEiu+IpIEynUDk8CDt9EvbXfL1Y/UIcIBDDg Cy78zIeIeoJBV8n2XANQdHS4Mqy0+6nmHOtbao9XO3liNJRG5DfXYTRjyNnjppNKLkfpNN 0F+eoGcEhS+7h0mrgEjcVK2MuUABBJ2CSXWy9+3ip24ZdPwyHZEGSIuLqQFlV+hrPW6y10 X3L6/KAnqqpcUB+tcwq/ykUYA3yiZbaH5jF4PvmNLAvUY+u2nSQwFDfidY76qg== 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 4P1h7V66L9zQh6; Tue, 24 Jan 2023 22:13:26 +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 30OMDQpF088437; Tue, 24 Jan 2023 22:13:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDQQb088436; Tue, 24 Jan 2023 22:13:26 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:26 GMT Message-Id: <202301242213.30OMDQQb088436@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: 5df48d2d0386 - stable/13 - stand: Implement ofw disk print routine 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 5df48d2d03860a81d7a1867aeac3c5768109eeac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5df48d2d03860a81d7a1867aeac3c5768109eeac commit 5df48d2d03860a81d7a1867aeac3c5768109eeac Author: Warner Losh AuthorDate: 2022-11-30 22:09:56 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:40 +0000 stand: Implement ofw disk print routine Have lsdev show openfirmware devices. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37555 (cherry picked from commit 40d340acb9316db5771fe777e279776b903336d4) --- stand/libofw/ofw_disk.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/stand/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c index 8f4c0162d32b..67da8cbeb310 100644 --- a/stand/libofw/ofw_disk.c +++ b/stand/libofw/ofw_disk.c @@ -184,6 +184,30 @@ ofwd_ioctl(struct open_file *f, u_long cmd, void *data) static int ofwd_print(int verbose __unused) { + uintmax_t block_size, n; + int ret; + char line[80]; + + /* + * We don't have a list of devices since we don't parse the whole OFW + * tree to find them. Instead, if we have an open device print info + * about it. Otherwise say we can't. Makes lsdev nicer. + */ + if ((ret = pager_output("block devices:\n")) != 0) + return (ret); + if (kdp != NULL) { + block_size = OF_block_size(kdp->d_handle); + n = OF_blocks(kdp->d_handle); + snprintf(line, sizeof(line), + " %s: OFW block device (%ju X %ju): %ju bytes\n", + kdp->d_path, n, block_size, n * block_size); + if ((ret = pager_output(line)) != 0) + return (ret); + } else { + if ((ret = pager_output(" none are open, so no info\n")) != 0) + return (ret); + } + return (0); } static char *