From nobody Sat Sep 13 15:47:34 2025 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 4cPFzp4L3Xz66dnZ; Sat, 13 Sep 2025 15:47:34 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cPFzp3hPFz3jtT; Sat, 13 Sep 2025 15:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757778454; 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=J/EsM+SFdVoKb/vILBM8NKVFO3CZYX0/FaH/hDH5djY=; b=sGbPJjwg2yG8p7NuJi6cHXkPIeZMiiVHCyApYrGi8jB3qUzZGDIHDY5sFvdJFrW5kxS7va fPC5Sp2O2nD0zAxJa68CXeCuWdvqkNAZ/oHQU1hmHQNVAl/8eL0orB9ElJe4ecCkHg+bgv PuVCy/JZRscYhzjCGJ9I8vU6ORCQ9F9Sz3M9QhbJWIuTPJR23WKEbiaV2IzEygBSfybVHJ 1zzomOl0a2dd0RMPD0mos26R5veS/DZxb/eaP3a02Q1+wqsYxCUWP98Z9S98Rtq4cuxnxl yL1ldbUHYLFD21WtNUjESQV46DRgp8MSAxz9x2pGPGLdfuxydznfN5dg0/uNQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757778454; 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=J/EsM+SFdVoKb/vILBM8NKVFO3CZYX0/FaH/hDH5djY=; b=a67Eqi+Ai3qWhkqAm8Aaz0KqxESoHvjmIddnL4v61Q3D1Y/l2FMOXl6ZJVkGQgN6iW46lr BqLaps2Ju9BzDtQbtsoW6yNlckdEn8elc2eovjqbNahJqPf0bWm07JR/VeaQA6/xJaRTIQ csJc6p+uU7qzhnX7TtGkLfvp/ikl7Zp9iXUG0cGwnktCeIEnHNtO0WeOs/hEEy71K4MoqE SeKJ1VWOAs9Cbdzn2ljN8afeb2fLuoZ5JW1oYsZvlCoK/TXFjvFld1g/6ImLtvV4qtTE5L U2ephNGutv2cFyUYi0DM84X8SBm9PjRa/fnDYgOw2UuhNxU1Jit3flt5BrAi/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757778454; a=rsa-sha256; cv=none; b=vP2Ujd8RxTb3/0tYHiELNDgSYzCNmSWQbsTDtUmHRI2vJnsXL1FStsw2G0d28cKsYOEcPT KKITm1zIu68mcBZ19S/ZaBn06MmAy0reG2TBilcxv4+q0AXa75O6OQHUL01SCQ/OJSNIQj YzKwbYOl70vZ8NtZG1hmpLhb9YA9m3gRcTRArtzHwd40hrIXn2rm6j75kWAJBDVealE68x fPBnUpN4pwfLWTjOY2G89DU1S/i8zr01IOB+Vy5Nvy6q1cYH66dbeG+e5LuNX2IrHXUmqI aPpRz9HkAqvYhiKpMoJy0yHdkiKG7d38Qr4sQj982MdIskoYcrEjrdmI5HFTHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cPFzp3FcMzl3P; Sat, 13 Sep 2025 15:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58DFlYD9050004; Sat, 13 Sep 2025 15:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58DFlY9b050001; Sat, 13 Sep 2025 15:47:34 GMT (envelope-from git) Date: Sat, 13 Sep 2025 15:47:34 GMT Message-Id: <202509131547.58DFlY9b050001@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: 8a4e4c95244b - main - loader.efi: Properly scope variable 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 8a4e4c95244b9082c7f423f7206c1d2b90ffb628 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8a4e4c95244b9082c7f423f7206c1d2b90ffb628 commit 8a4e4c95244b9082c7f423f7206c1d2b90ffb628 Author: Warner Losh AuthorDate: 2025-09-13 15:46:25 +0000 Commit: Warner Losh CommitDate: 2025-09-13 15:46:25 +0000 loader.efi: Properly scope variable guid here is only used for EFI_ZFS_BOOT, so move the ifdef. Noticed by: wosch and clang 20 Sponsored by: Netflix --- stand/efi/loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 3e179bd4296c..304b2e48272c 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -315,9 +315,9 @@ probe_md_currdev(void) static bool try_as_currdev(pdinfo_t *hd, pdinfo_t *pp) { +#ifdef EFI_ZFS_BOOT uint64_t guid; -#ifdef EFI_ZFS_BOOT /* * If there's a zpool on this device, try it as a ZFS * filesystem, which has somewhat different setup than all