From nobody Mon Sep 8 17:03:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1754295177908843.8424219615704; Mon, 4 Aug 2025 01:12:57 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9A5E3BDE; Mon, 4 Aug 2025 04:12:56 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3BDA7AC0; Mon, 4 Aug 2025 04:12:45 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BBA33A96; Mon, 4 Aug 2025 04:12:41 -0400 (EDT) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id AF7A5942 for ; Mon, 4 Aug 2025 04:12:40 -0400 (EDT) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-615378b42ecso5142643a12.0 for ; Mon, 04 Aug 2025 01:12:40 -0700 (PDT) Received: from tulp.my.domain (80-115-115-199.cable.dynamic.v4.ziggo.nl. [80.115.115.199]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-615a8f15fa5sm6364524a12.14.2025.08.04.01.12.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 01:12:38 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754295159; x=1754899959; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pt1A56giLy/Vm0xck7imFN0FQ5iHp4bs9BSrwKqZAoE=; b=mUk8Z8wx5AfNy98gqQTvKvAzvUNP1XTlTqEup5/zKeyBP36DPIsm7T+BmygTMUmzSM /nwlXt8g3X2T8Mk1IlwJXEsc7Wj5IN3RZ1FK2+Ei/hEAz5LjqSynu3HCUqCfu1i596Sy Z3gGP+Q6ntUwwy6pFrnvTgRQnH1LbJPgvdyuUbc4kA/WFm0cwwegM2wx93yf+CpCxPLT vmawePiMHMipTxbJ3SILGtkKiFxNnNycVaYhFSdZ+EHXUj3Hd4GD8pvb7h3gl+quAjIK Q4NS1785cYV8Lms+G7z4RGArm17ZYFBANs2M3BaQwfXH2HVNgoVzdeIfm/pS9Efc751S 3zVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754295159; x=1754899959; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pt1A56giLy/Vm0xck7imFN0FQ5iHp4bs9BSrwKqZAoE=; b=v5f9iVBoe7t6ntHPAsw93ibOjZtU9vAD4DiEP3870mv0nIJU1bp8kqsUWJwttFQHCh 9VNjH9og/s4qdlckj45zSkCRpBZIYQeb5BzkH7G9Rp+Gl7IEyetpUAAQiZVAX0qkktqT rLlEwwZ/rdQbFZAvBj1hEmAQd0MBjOjLOtyg5m+nfxBDqnvtNayo3VUTBlc9My7GcSHk kXyWbys5tzDHE4EHtnoz0t5fB95ouHB3bTkGxbnMSMwIanngInsaw4JHoNBGgZBw3D2U IDbddmQpt/FMiy36zLic+/GSmlRzrxLjAKWfiH6C0zbIXiXHGoohiWbCi9Z43DcTGXE9 Tb8w== X-Gm-Message-State: AOJu0Yw0l/zG1PKP3INoIn5iTAkRR//T0WZBWAc44Z5+BQZEEtQDGE1Q U1u0nFraZcirxWcq2SLivuLKphJVUJanknQ4bZ8LPtI/TlSTtP1ekPUdrlonfAVKvvw= X-Gm-Gg: ASbGncsYwLLobIg+Hl10LK/gQR992XDZM1Bub9JxEBopNjajUwzxyRXC0zi+FM3PPQI 186dqGsenA99SvfsUDWMrPPq1m+VJzNgIlciRW+VERLq2O2nDMdLiYhuB/aQmXXUvXt+hPeC80J JE7W7bxVhiMM4UfB5s+2GLpBd/Z68Glf9jNL1U32pCVw0aGNAKwfUdArav/DPh025O/kBWLYzzg /1CkiwwTHjR9Oh5u106Z/MkKM7kLQZRoIUeaA1TR1XT2/5/PSnYzEcgeOr9a5rxAdqkuUQH+9l+ PwGF+U8dCWWYCmOXPCaEmn0McyIRpdjOWOUP7vDOfVwupMJGQ1hs32r1P0DFtUuqMMdtY3qTKu7 FErGfI9RzWclSk5cujpT4hDCxT8TH3NSvegijsIiLPwnYerIAsXNLof7089pICjy2XXHChAQ= X-Google-Smtp-Source: AGHT+IGnKafCUrZUXqwRnxLcCObi3nl74etYpSlrIwXHNCMhm07gB1FjosMfly+6MmPu165SM+BokQ== X-Received: by 2002:a05:6402:354f:b0:615:adc4:1e66 with SMTP id 4fb4d7f45d1cf-615e7173006mr8025458a12.25.1754295158829; Mon, 04 Aug 2025 01:12:38 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH] bhyve: autofill NVRAM data for firmware='efi' Date: Mon, 4 Aug 2025 10:09:47 +0200 Message-ID: <20250804080947.52969-1-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: YLGP6UW3W5RV5NY6SA5WKOR2Z2QKERYT X-Message-ID-Hash: YLGP6UW3W5RV5NY6SA5WKOR2Z2QKERYT X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1754295178840116600 Content-Type: text/plain; charset="utf-8" When a domain configured with "", autofill not only loader/firmware configuration, but also nvram. This also fixes the `scripts/domain/405-ovmf-nvram-efi.t` test in libvirt-tck for bhyve. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_firmware.c | 5 +++-- tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bhyve/bhyve_firmware.c b/src/bhyve/bhyve_firmware.c index 36bca490b6..57ad0031b0 100644 --- a/src/bhyve/bhyve_firmware.c +++ b/src/bhyve/bhyve_firmware.c @@ -72,8 +72,9 @@ bhyveFirmwareEnsureNVRAM(virDomainDef *def, /* otherwise we want to reset and re-populate the definition */ virObjectUnref(loader->nvram); } else { - /* Also do nothing if NVRAM is not requested */ - return; + /* Only add nvram for "" */ + if (def->os.firmware !=3D VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) + return; } =20 loader->nvram =3D virStorageSourceNew(); diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args b/test= s/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args index c87dc7d779..16b9c50535 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args @@ -5,7 +5,7 @@ bhyve \ -H \ -P \ -s 0:0,hostbridge \ --l bootrom,fakefirmwaredir/BHYVE_UEFI.fd \ +-l bootrom,fakefirmwaredir/BHYVE_UEFI.fd,fakenvramdir/bhyve_VARS.fd \ -s 1:0,lpc \ -s 2:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:00:00:00 \ --=20 2.49.0