From nobody Thu Feb 29 16:14:59 2024 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 4TlxBq4yHsz5CS4D; Thu, 29 Feb 2024 16:14:59 +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 4TlxBq48z2z3x20; Thu, 29 Feb 2024 16:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709223299; 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=2rCimM2FRbFb8pNkMXiL6f+NJ9iUhQzsJlyL/ATQjyw=; b=DNQO9OFnVfW/Dto/6RzCHDBdJr1KhF7HInvj1lOy+Ze0kDaz4o3Ve1NZFO4BhflREWO2nk sO8pljprA2PbrKSTxKsBGYKY+s6BhQwrFpi+j5b33mu3aYcDcO3aw97T1N9Lv0W42YllxW 8C6AP+nr3AQkeTAyUje7kxEy+nMW3UVLLnJrakWqlG7v1dnpzzg+7/JxzqQvpZK/ECu1wF BfOcNNhs5aQlgCW9xKdRYu9G0PcBSFGaUCh4gzo2TDqYYlDV4UV50Tgxoz4qfpzTL/gcaB 62hverJ4VuAiEdbu7PnyXRHMiu7/emQGfABrvWuq0dRJB3lZkffemOZ8HueREg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709223299; a=rsa-sha256; cv=none; b=rkhDhZtQgx5uBRSRfZZTEeAayZhefaYc77zd8boE5ss/b0kyLfzjJqvSYmqqiE9+xa29ZR nBF/qCwmagnjWLipphBkfoEr6Yct9NzutRN/bVYFPEY4uvAvHTwyWtgxJfX4eviIcPYgJS r3g9cfyjtSAVSr4YyPvJHqupBeE+MqaP9Ehf6suU9VbVL1D+hizwyCzl2KDsXM3TyIrtdn Y83NOyJWVxijvgkHFR2MHpjqD3H4HuxQmxn7LKR6MRp9NrX3HJg1Q9VCAT2+WLwbkGTlgl VQNkfkMh0ruH2v6T8L77PPWjL5VY778nsiZAbVAW1iIFGOoxadpM1pviUQoLSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709223299; 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=2rCimM2FRbFb8pNkMXiL6f+NJ9iUhQzsJlyL/ATQjyw=; b=nHITVvJ5YECwL67BDYMpP+v4jp9RG4pXkstQdulPcrn+DjBTJuWnt/5LABQjuuNXiUzmnG q0KfTxcEWZrjJz8y5myi2H4dKNOIjkvtXDMEK//gtelAr0r6olX9S7Ma0PMIgZOCd/OEEz GpLGxa6WLF9iaiDwhv5t/ZVV/pYH17OFkdbRqgRPZF7PV5wC4yP7XnbDaWcQmKRpss+XnX IgVAKdh8PibD3z/9HTbaZ0RcNLyk0/6MOgedLzFYT61AEncwe5iJyYafFKQnwl9bb4gwfP ZX1h/F0sLYIei7eOP9WEZF7Bd9ZpNQiN5kbekyX0Z1hnjO/nhDhub8M79fzPxg== 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 4TlxBq3mx2zpcY; Thu, 29 Feb 2024 16:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41TGExDF007459; Thu, 29 Feb 2024 16:14:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41TGExi2007456; Thu, 29 Feb 2024 16:14:59 GMT (envelope-from git) Date: Thu, 29 Feb 2024 16:14:59 GMT Message-Id: <202402291614.41TGExi2007456@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: 2425dbdff3d7 - main - loader/efi: Small diff reduction 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: 2425dbdff3d7c23f464262517faf1f99a1b51165 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2425dbdff3d7c23f464262517faf1f99a1b51165 commit 2425dbdff3d7c23f464262517faf1f99a1b51165 Author: Warner Losh AuthorDate: 2024-02-29 16:14:41 +0000 Commit: Warner Losh CommitDate: 2024-02-29 16:14:47 +0000 loader/efi: Small diff reduction Make doing the boot once protocol more similar to copies of this code. Sponsored by: Netflix Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D44007 --- stand/efi/loader/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 12efe594e0e2..e4d62f2e940c 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -261,8 +261,9 @@ probe_zfs_currdev(uint64_t guid) currdev.dd.d_unit = 0; currdev.pool_guid = guid; currdev.root_guid = 0; - set_currdev_devdesc((struct devdesc *)&currdev); devname = devformat(&currdev.dd); + set_currdev(devname); + printf("Setting currdev to %s\n", devname); init_zfs_boot_options(devname); if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, sizeof(buf)) == 0) {