From nobody Thu Mar 2 18:18:33 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 4PSK9P3Zcbz3w6bV; Thu, 2 Mar 2023 18:18:33 +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 4PSK9P2Z5kz3Mhb; Thu, 2 Mar 2023 18:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781113; 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=h+gPr88wPA09uaVYC+e6JwWjOZ1HRQZ9oCPFlwrst+E=; b=R784B7aLudaNrdyH8fhSWfi/mR0y3B2OLuQfYms4ot8x3YXg1cEBx9D4AUD/dWUYZ0ixL/ O1OOi0RjYivWtIuG/o5PDK0e/Z4sqtqDd/cHct46hqPQhEZHqT+ApOJlZ1kJ/32UwSUczG 7ThuSDY5lIUXygk6gYKgj1GwTnBAzsiaTEdPYHYPGHK3FLNKofyxfekAYQgPLYu8lONxZv diFM6ouMKMAwwc2nyb1HUPDQpmtyg5Rh1KDITu2PEzrMVzP4Ikv15g5sna9z2Uwv2labf6 S0zBC65D7W4HSVtrrvFrN+j/1Zapg8WKcLi3xVRizNMegwEQXJx7ktWrQEqC4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781113; 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=h+gPr88wPA09uaVYC+e6JwWjOZ1HRQZ9oCPFlwrst+E=; b=iMu835wsECobyJsANqX4rU4Bu7uoxWLOvkXKCMBHHi1XTYFZkv7rmzRGoF6uoWzIggA7TZ BMoUaObOjU8HiomOiGPN8nlFNz/ME13ScmxrpKDuGIOpj/2K0oL3IMcIvrlBBfcxITM7q/ XTlq/aGTvWAShoBjG4uAcP5ULiBbFOuNfyWO6+ca6Sr04BZTnYUnf6Lirg4JOgv/W32LKe zDI4us2vrlNfSAmylvzIsKx32urP23P4YTJoelsMeBYK66MwgH86WPpijl3crRsPao0qIQ zn0qQiz5DeDfBYXGcyp8AOPmPPjezeMVW1VjJ4pWrdT7aVBSmIDc2C7ffreCUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781113; a=rsa-sha256; cv=none; b=vcqm09TB09KjL6qSlrVgjlq7i1FsYekovgZ1eJFRtSbPru2grsROHQr3BLLGA/LoMzzgcS ojaQBAszjxjMAaI+Gh9pCzNpdc1GV71JjYU5FRyRs+SRELFHuErwHSykAH7G/clagBcH2J GFUJkxLPaLGxXvJ7AmZTZsn3fX50DItGJvxywqRaTSquFsRuAENTpCYKeqElGNDTF24JQm 3Kysxcsk6SLuPWbCHutK0IQ5QGrnn3g9fn1S5l439+nJUYKdDORoBXSTCJBLzTuZTEBikk WtXgIR/3TKOs7zSZaAAkuRMdVk0Rhe1iHhOEKPC1yEoNpE1qdLYlXFBkgomEwg== 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 4PSK9P1fmdzQrG; Thu, 2 Mar 2023 18:18:33 +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 322IIXHD035430; Thu, 2 Mar 2023 18:18:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IIXv4035429; Thu, 2 Mar 2023 18:18:33 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:18:33 GMT Message-Id: <202303021818.322IIXv4035429@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: 7b4299eb4e7c - main - kboot: Fix hostdisk_override 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/main X-Git-Reftype: branch X-Git-Commit: 7b4299eb4e7ccf3f2a9ecf7b3fadaa8e5aa78dc3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7b4299eb4e7ccf3f2a9ecf7b3fadaa8e5aa78dc3 commit 7b4299eb4e7ccf3f2a9ecf7b3fadaa8e5aa78dc3 Author: Warner Losh AuthorDate: 2023-03-02 17:57:43 +0000 Commit: Warner Losh CommitDate: 2023-03-02 18:12:10 +0000 kboot: Fix hostdisk_override We were assuming that hostdisk_override was both a directory and a file, which is not going to work very well. It's supposed to be a single file, so recode it as such. Simplify erorr handling a little as well and fix a return type-mismatch that doesn't matter for the generated code (return NULL is the same as return false in this context) Sponsored by: Netflix --- stand/kboot/hostdisk.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c index b71ae256b0f6..5cc7825034dd 100644 --- a/stand/kboot/hostdisk.c +++ b/stand/kboot/hostdisk.c @@ -249,31 +249,22 @@ hostdisk_one_disk(struct host_dirent64 *dent, void *argp __unused) return (true); } -static bool -hostdisk_fake_one_disk(struct host_dirent64 *dent, void *argp) +static void +hostdisk_fake_one_disk(char *override) { - char *override_dir = argp; - char *fn = NULL; hdinfo_t *hd = NULL; struct host_kstat sb; - /* - * We only do regular files. Each one is treated as a disk image - * accessible via /dev/${dent->d_name}. - */ - if (dent->d_type != HOST_DT_REG && dent->d_type != HOST_DT_LNK) - return (true); - if (asprintf(&fn, "%s/%s", override_dir, dent->d_name) == -1) - return (true); - if (host_stat(fn, &sb) != 0) - goto err; + if (host_stat(override, &sb) != 0) + return; if (!HOST_S_ISREG(sb.st_mode)) - return (true); + return; if (sb.st_size == 0) - goto err; + return; if ((hd = calloc(1, sizeof(*hd))) == NULL) + return; + if ((hd->hd_dev = strdup(override)) == NULL) goto err; - hd->hd_dev = fn; hd->hd_size = sb.st_size; hd->hd_sectorsize = 512; /* XXX configurable? */ hd->hd_sectors = hd->hd_size / hd->hd_sectorsize; @@ -284,12 +275,10 @@ hostdisk_fake_one_disk(struct host_dirent64 *dent, void *argp) printf("%s: %ju %ju %ju\n", hd->hd_dev, hd->hd_size, hd->hd_sectors, hd->hd_sectorsize); STAILQ_INSERT_TAIL(&hdinfo, hd, hd_link); - /* XXX no partiions? -- is that OK? */ - return (true); + return; err: + free(__DECONST(void *, hd->hd_dev)); free(hd); - free(fn); - return (true); } static void @@ -299,7 +288,7 @@ hostdisk_find_block_devices(void) override=getenv("hostdisk_override"); if (override != NULL) - foreach_file(override, hostdisk_fake_one_disk, override, 0); + hostdisk_fake_one_disk(override); else foreach_file(SYSBLK, hostdisk_one_disk, NULL, 0); } @@ -540,7 +529,7 @@ hostdisk_gen_probe(void) return (rv); } } - return (false); + return (NULL); } #ifdef LOADER_ZFS_SUPPORT