From nobody Tue Jan 24 22:12:50 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 4P1h6r1T3Jz3bg9W; Tue, 24 Jan 2023 22:12:52 +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 4P1h6p58R9z3DmS; Tue, 24 Jan 2023 22:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598370; 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=8nS+C+5NZQvAiZ7YLIqP62KJF4jjQAMTKwi0wSMYFlg=; b=YFYQQm5XYNuS1eLX4kJbRu8quz1qYs9N2Y98jdtfX1lgx3QAkQ+SDAo2VAU11YQQpGy3FF sC+m8ISWDCfk4p5pQ1ZrQLRk2NBzl+M/1n6gruGLp6eJT6Ks40W3Hy0l5CVBxxEsipEifY HHZlYXM7xojKCyiHJCfIeHrdYqRoT3Jaj9BeySqXGeyv9dwdKUwq3Ap3CkT+YIvPx9GW6M 2rmd1hypuXe+6QYbKC/ZG7XgjhzGsvDaJ6nppQpZwGvVCl3EUyrOP5Crw3rjFnNVqQY6n3 VgiXhqWGJ2yjEvillbNpmyV0GJwTMgAONBbMowG7BAEsGao8kdbpBLZ4FeRrHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598370; 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=8nS+C+5NZQvAiZ7YLIqP62KJF4jjQAMTKwi0wSMYFlg=; b=Yrw5N9VQ1tNq1ydyR/4Y5GD+TKccH3tYBI/Vo/wiJtRMb9hVeKvFTVovSa5MQJ4YG4tosv K4TxWz9oNnVi19r1DlkZ8GYOX6m4UsqTNt3proEljxaei3QHSTjfqltgaZNoTQ/cj7mz0o 7mjn5vqDHyGFqt0hkcgTy9HP/ew9qBC6MCps3tHuBLSeoAalIe8N5ckfvZPz5wgXKLLkkV Nwta6DeZAyNam243i23mDTMI9e0BhDKQzx2MYYmfKezNOma5tEgF61hziYH0V/71xEcnpZ bWNBJlqB/WnPgCL6uKRYYaBiDz1Hbj+kenHICY4L4LdgtPbO+qsH9k4mB7+FTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598370; a=rsa-sha256; cv=none; b=YD+nHagBooCydZDKpJg8ucqnc8mGL6av76iZTjOBW7V1qKeavh81qx6ECWIr1xGmYhvCiT aNkE0LVFyBnvCWJ6cqQ3kp9eb6SXDSnPBkm+ysfx4Al0uTlWZWnnNQ0oC30oOeMYYKw70j YvAm/SaTnOTK5CSO1rCIO1zZuwiKcFHPzN8auWii6nUdzodGaQ0aWht7DyoLOVNhFwYVh7 kHujtz7yWfKbUesDBnrpSaHVyH4PG2GxpVN6ENEpjUlCh343j8k36q2vCRshP0GEjl0OB6 p9J9H+f/IMCnRQOiJxhrnj36vJyXklEyOOEYU7Ikwq/zw3f7CfGe7H0xZiHCuA== 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 4P1h6p4CVdzQVh; Tue, 24 Jan 2023 22:12:50 +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 30OMCovA087595; Tue, 24 Jan 2023 22:12:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMCoL7087594; Tue, 24 Jan 2023 22:12:50 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:50 GMT Message-Id: <202301242212.30OMCoL7087594@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: cf39b45a3043 - stable/13 - kboot: hostdisk add to lsdev output 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: cf39b45a30431ce84339970d30fbbf7e864af4de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cf39b45a30431ce84339970d30fbbf7e864af4de commit cf39b45a30431ce84339970d30fbbf7e864af4de Author: Warner Losh AuthorDate: 2022-10-08 05:46:20 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:36 +0000 kboot: hostdisk add to lsdev output Not entirely sure what to do here, so just list that we're here. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D36606 (cherry picked from commit 6700f34d126eb4892e24f4c7758e9f570de2fb4e) --- stand/kboot/hostdisk.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c index 00f133274f10..487f24fde821 100644 --- a/stand/kboot/hostdisk.c +++ b/stand/kboot/hostdisk.c @@ -127,6 +127,12 @@ hostdisk_ioctl(struct open_file *f, u_long cmd, void *data) static int hostdisk_print(int verbose) { - return (0); -} + char line[80]; + printf("%s devices:", hostdisk.dv_name); + if (pager_output("\n") != 0) + return (1); + + snprintf(line, sizeof(line), " /dev%d: Host disk\n", 0); + return (pager_output(line)); +}