From nobody Tue Apr 16 20:13:26 2024 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 4VJwGG61jkz5H0j0; Tue, 16 Apr 2024 20:13:26 +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 4VJwGG47cFz4vMn; Tue, 16 Apr 2024 20: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=1713298406; 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=AgipyxL6nm9gkvusigHSzunzbKkj5ggrcrXh/wSQCcU=; b=a9xOTdhHQCz9tee927hS6V01gzDREobsASf7ouJCOVvT+d6KK5KgkznbEhdmKwSFohuPtZ FoyhTtq5uxMMJnl27Akn+wxgQFzwtb/CbfBtcQhlDSuoOCVw+yjUQQmePDHfYcOYNggs2G /bOze5j/Cmej75NEDIA0Dv/lGEAxz8oArHfgTjR2r6DvREaSunIi5jKPKNQ2s4NoZgpXkC iFpOAfIqFMSLtWx8r25a8DQM46hiDLXIfs5eNIMGv/QfD8VeBHbFMjTWUStEA8VUyrNDBh ga8kmFnT6ndWfxRCu8eJ+OrgPcUXXR/D38wDSYMN/dErbVOEbKOqL1YazEqoyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298406; a=rsa-sha256; cv=none; b=wYoLimVc00IzbwZJnhuzkNgfoZGIfx0y4oO2awt6kkcScJejBnGfVbSaAMPjBYB5fTZ1fR S+cEBwpSI/2wtCQiNqpHSVMbBu5F9c6UJTh8OK5b7yZc/I6VImPsd2ivKanVXoacq4JFGO PUkI3TQwxkPATD0HvHP5wbwmxNlfX5RdYLoZqGn4WRV8OydEc1w1skgktvpSbf+OMbS2pa AYhwkhxcTzi9Dne+AY6V0XcSFKC88IvwYKHznjtZXwF8Y+GSsNEoGdWfO3ZFekfjV41TlZ KyM/VKDg24+p8etwfgp9aKTWmyX0UWpzVRoBs1Ny//aHYQX93sXrJXciHPW5tQ== 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=1713298406; 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=AgipyxL6nm9gkvusigHSzunzbKkj5ggrcrXh/wSQCcU=; b=MJNolW8HYP/qI50Ctd3qjUgEoBBJcNUaOlUwvKuL2jlnABf57UcGsLz25t0wf0Z/wG5cgS uPcpzDc3oOj+3OEbFTj8oPsVMzogrAgKby910PLrN5a8SqfQyq12rJhHTCtviobXC5Sfen ATGuzsxdQT/YDEGGjRE9kkf4jdeIsOSyBtChR6nDWlkycIMfROxadwhOXiyF7wwqcuz7X2 ERL+ga71A7ouHj1h5vccMvpTli3lgr0Qc/t/zfa/L0Bt0FNl2POtdzBPpuhMIspETcaPE5 0InJJ2DkrtEY+N5YjcJbLiVeuqKFJX7BR04lELzIg/TR1wpk9oZON2UermPQvA== 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 4VJwGG3jqgzxJZ; Tue, 16 Apr 2024 20:13:26 +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 43GKDQuq039573; Tue, 16 Apr 2024 20:13:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKDQVs039570; Tue, 16 Apr 2024 20:13:26 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:13:26 GMT Message-Id: <202404162013.43GKDQVs039570@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: d9288e8fcccd - stable/14 - loader/efi: Small diff reduction 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: d9288e8fcccddfd230c8b3d5eec74f95910d04e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d9288e8fcccddfd230c8b3d5eec74f95910d04e4 commit d9288e8fcccddfd230c8b3d5eec74f95910d04e4 Author: Warner Losh AuthorDate: 2024-02-29 16:14:41 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:28 +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 (cherry picked from commit 2425dbdff3d7c23f464262517faf1f99a1b51165) --- 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) {