From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id E1F8D1FF0A7 for ; Mon, 17 Aug 2026 11:36:51 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 918E223B45; Mon, 17 Aug 2026 11:36:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=genua.de; s=202307; t=1786958973; bh=1BJhFKxwiOeEoU/mxKkXhTgTWhm0HC3mGbbF1kFZadI=; h=Date:From:To:Subject:References:In-Reply-To:From; b=zxTb+fpI5YdG3gFcyqsS4lSTr3BJS73bmWjK87CxVtQ+kZP9Z4h/jRnon+8SqIifc gW56T15ER5anVvVM7iRaR8NbXdKSjWCzpGzkxGztcxG16i6JXBDl32o4Z6WPgi3wmG 905mAFiB+xtIuN45MWSUQ0CUBFdU6CQ9n/8YpBlj6wbrpymZbXabFRt07n5fXA1ix/ cezcSe0sOgj4pJ6L6pQZx0Cbf82CljWnH898m+4eQc8plqk3xkgfLFrPnkTiObRcEn z9yQO1Ukg+bCmLbynsCb3lVoFQJPdzBtzkAKp1XVd0D3utWMRUFif3f7nuBkuw4PFM m2xrdhFG497yw== Date: Mon, 17 Aug 2026 11:29:32 +0200 From: Christian Ludwig To: , <-b@genua.de>, Subject: [PATCH qemu-server 09/13] Generate efi-firmware Qemu command line Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-Originating-IP: [192.168.217.185] X-ClientProxiedBy: kch1-mta09.win.genua.de (10.208.16.109) To kch1-mta07.win.genua.de (10.208.16.107) Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg="sha-256"; boundary="----75F72E021F2B5BE77864E1A4C554C25A" X-SPAM-LEVEL: Spam detection results: 0 DKIM_INVALID 0.1 DKIM or DK signature exists, but is not valid DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DMARC_PASS -0.1 DMARC pass policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record UNPARSEABLE_RELAY 0.001 Informational: message has unparseable relay lines Message-ID-Hash: TNH4K4OHF2JLGU2MERED5B73RIIK3EMQ X-Message-ID-Hash: TNH4K4OHF2JLGU2MERED5B73RIIK3EMQ X-MailFrom: christian_ludwig@genua.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Content-Filtered-By: Mailman/MimeDel 3.3.10 X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ------75F72E021F2B5BE77864E1A4C554C25A Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline If efi-firmware is set, use the correct EFI code file to create the Qemu command line. Signed-off-by: Christian Ludwig --- src/PVE/QemuServer/OVMF.pm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/PVE/QemuServer/OVMF.pm b/src/PVE/QemuServer/OVMF.pm index 67665c7c..fe301353 100644 --- a/src/PVE/QemuServer/OVMF.pm +++ b/src/PVE/QemuServer/OVMF.pm @@ -123,6 +123,9 @@ my sub print_ovmf_drive_commandlines { if $cvm_type && $cvm_type eq 'tdx'; my ($ovmf_code, $ovmf_vars) = get_ovmf_files($arch, $d, $q35, $cvm_type); + if ($conf->{'efi-firmware'}) { + $ovmf_code = PVE::Storage::path($storecfg, $conf->{'efi-firmware'}); + } my $ovmf_vars_size = file_get_size($ovmf_vars); my $var_drive_str = "if=pflash,unit=1,id=drive-efidisk0"; @@ -219,6 +222,9 @@ my sub generate_ovmf_blockdev { if $cvm_type && $cvm_type eq 'snp'; my ($ovmf_code, $ovmf_vars) = get_ovmf_files($arch, $drive, $q35, $cvm_type); + if ($conf->{'efi-firmware'}) { + $ovmf_code = PVE::Storage::path($storecfg, $conf->{'efi-firmware'}); + } my $ovmf_code_blockdev = { driver => 'raw', @@ -268,6 +274,12 @@ sub print_ovmf_commandline { my $cvm_type = $hw_info->{'cvm-type'}; + if ($conf->{'efi-firmware'}) { + my $fw_path = PVE::Storage::path($storecfg, $conf->{'efi-firmware'}); + die "efi-firmware volume '$conf->{'efi-firmware'}' not found at '$fw_path'\n" + if !file_exists($fw_path); + } + my $cmd = []; my $machine_flags = []; @@ -277,7 +289,13 @@ sub print_ovmf_commandline { "EFI disks are not supported with Confidential Virtual Machines and will be ignored" ); } - push $cmd->@*, '-bios', get_ovmf_files($hw_info->{arch}, undef, undef, $cvm_type); + my $bios_path; + if ($conf->{'efi-firmware'}) { + $bios_path = PVE::Storage::path($storecfg, $conf->{'efi-firmware'}); + } else { + ($bios_path) = get_ovmf_files($hw_info->{arch}, undef, undef, $cvm_type); + } + push $cmd->@*, '-bios', $bios_path; } else { if ($version_guard->(10, 0, 0)) { # for the switch to -blockdev my ($code_blockdev, $vars_blockdev, $throttle_group) = -- 2.34.1 ------75F72E021F2B5BE77864E1A4C554C25A--