From nobody Sat Oct 08 05:51:08 2022 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 4MkvRx20ytz4VB3Y; Sat, 8 Oct 2022 05:51:09 +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 4MkvRx13S0z3CGk; Sat, 8 Oct 2022 05:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665208269; 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=YF1RH+XyFVeQ3S9wtZM9A+hCU3UmLctHClv+O0ctzkI=; b=bJHDHEGeW1UjAIvDz3eSkzp6JuErgYp2qs150mM4PLTs/X9cgzTTezA52WJf1I/LqHVNjx iPKrJOascFVTXxRu5RPxohfFmb9ub8ElfoGzJ9g1rByJDxiD2NdNp36Wwl9FgObXSwZSoG QXlXflCas3ykf3UpGDqr1+lwfoYclgK5WgUErkhccfvKC4FxvsAeDBnNqhT+v4y/rLgwJy vP8pVvSaa1y6natRvyDFTGMmfM3SBm2DBu5TOAMTTyPIh/x9H/SHXSHwymRRGiZZNfmm0W tgjMGBE6P7Ze92d8BKuK47rNfQNZ8dLLwR38+85EhxX+Qy3Kxw/ZGnIdgksBFg== 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 4MkvRw75fXzrFq; Sat, 8 Oct 2022 05:51:08 +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 2985p8OM028556; Sat, 8 Oct 2022 05:51:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2985p8GS028555; Sat, 8 Oct 2022 05:51:08 GMT (envelope-from git) Date: Sat, 8 Oct 2022 05:51:08 GMT Message-Id: <202210080551.2985p8GS028555@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: 6700f34d126e - main - kboot: hostdisk add to lsdev output 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 6700f34d126eb4892e24f4c7758e9f570de2fb4e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665208269; 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=YF1RH+XyFVeQ3S9wtZM9A+hCU3UmLctHClv+O0ctzkI=; b=KN+Fy6Eqe3ONFcYJpbNqUiPXWOnSkXcI/BXNNyWdulitPPWuVyzeogd9GS09N7N7RnS8YM 8fVp/TrXvz/K6Hr0OIh2JFQj/wGY/c+FLSEhf09BcwUq/fod61QNK/LNswLscQhNTVXTxY N1NyLQ/9EG9CI/PZUQokNPjyMpCHE9IJsxA1zBfnN81KnynDbaU4TyrBRfOdCpZHLkah3I fr0eU986snTwBH9WHmTGBnzF2TYwtlya7chNBveOqw2YSNSIRQfCJSgEteEH9L1c4yWVrZ 8hQhdbPBowCdj/CdAV60sjXmkBUvCx4at0y3m6tVi9VwoJAhusYLpel8vQbfuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665208269; a=rsa-sha256; cv=none; b=Czp5zwWj4SMAiyzkp4DeAvE22Mrrkjo9BhpBcWzKlja7KuGCpT+J7TXfbqeloUmwLFlX+2 8jhVAvsoHg8qOM24DMpm5dYpaDPZtf8atgb+HfDta8YRPYjalLfrwsKa9yQyZwlSTeQrJj ZU4yOXlDZi9H8VE2kCMiU3Kmy6Qqsb5WiyXxPGtBeFaLR+FNkC+9fm751K4OcB8zp7K5M1 ZqFkzfEPWJoZ2gteN4b7Npfg6MOkipB7fRcQbYlu3YuCYl3AoA5Iz9+y/O+d0eVFNgqiV4 AX3bBrS9MQgAlNe9ir6dKVb3xzvqlpvj6m5ENSDQHVxExdQpcl61DuQmlZmRxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6700f34d126eb4892e24f4c7758e9f570de2fb4e commit 6700f34d126eb4892e24f4c7758e9f570de2fb4e Author: Warner Losh AuthorDate: 2022-10-08 05:46:20 +0000 Commit: Warner Losh CommitDate: 2022-10-08 05:46:20 +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 --- 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)); +}