From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 472C71FF17E for ; Thu, 11 Dec 2025 13:31:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CD2A214985; Thu, 11 Dec 2025 13:31:57 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 11 Dec 2025 13:31:22 +0100 Message-ID: <20251211123145.143908-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251211123145.143908-1-f.ebner@proxmox.com> References: <20251211123145.143908-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1765456306694 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.018 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server 2/6] ovmf: enroll ms 2023 cert: pass along parsed drive X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" This makes the following changes easier. Signed-off-by: Fiona Ebner --- src/PVE/CLI/qm.pm | 10 +++++----- src/PVE/QemuServer.pm | 3 ++- src/PVE/QemuServer/OVMF.pm | 11 ++++------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/PVE/CLI/qm.pm b/src/PVE/CLI/qm.pm index ca57409f..adf90f3c 100755 --- a/src/PVE/CLI/qm.pm +++ b/src/PVE/CLI/qm.pm @@ -30,7 +30,7 @@ use PVE::Tools qw(extract_param file_get_contents); use PVE::API2::Qemu::Agent; use PVE::API2::Qemu; use PVE::QemuConfig; -use PVE::QemuServer::Drive qw(is_valid_drivename); +use PVE::QemuServer::Drive qw(is_valid_drivename parse_drive print_drive); use PVE::QemuServer::Helpers; use PVE::QemuServer::Agent; use PVE::QemuServer::ImportDisk; @@ -729,9 +729,9 @@ __PACKAGE__->register_method({ my $storecfg = PVE::Storage::config(); - my $updated = PVE::QemuServer::OVMF::ensure_ms_2023_cert_enrolled( - $storecfg, $vmid, $conf->{efidisk0}, - ); + my $efidisk = parse_drive('efidisk0', $conf->{efidisk0}); + my $updated = + PVE::QemuServer::OVMF::ensure_ms_2023_cert_enrolled($storecfg, $vmid, $efidisk); if (!$updated) { print "skipping - no pre-enrolled keys or already got ms-cert=2023 marker\n"; @@ -746,7 +746,7 @@ __PACKAGE__->register_method({ eval { PVE::Tools::assert_if_modified($conf->{digest}, $locked_conf->{digest}) }; die "VM ${vmid}: $@" if $@; - $locked_conf->{efidisk0} = $updated; + $locked_conf->{efidisk0} = print_drive($updated); PVE::QemuConfig->write_config($vmid, $locked_conf); print "successfully updated efidisk\n"; }, diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index d634251b..86f1347c 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -5424,7 +5424,8 @@ my sub check_efi_vars { return if !$conf->{ostype}; return if $conf->{ostype} ne 'win10' && $conf->{ostype} ne 'win11'; - if (PVE::QemuServer::OVMF::should_enroll_ms_2023_cert($conf->{efidisk0})) { + my $efidisk = parse_drive('efidisk0', $conf->{efidisk0}); + if (PVE::QemuServer::OVMF::should_enroll_ms_2023_cert($efidisk)) { # TODO: make the first print a log_warn with PVE 9.2 to make it more noticeable! print "EFI disk without 'ms-cert=2023' option, suggesting that the Microsoft UEFI 2023" . " certificate is not enrolled yet. The UEFI 2011 certificate expires in June 2026!\n"; diff --git a/src/PVE/QemuServer/OVMF.pm b/src/PVE/QemuServer/OVMF.pm index e5f4cf02..4aa98100 100644 --- a/src/PVE/QemuServer/OVMF.pm +++ b/src/PVE/QemuServer/OVMF.pm @@ -279,9 +279,8 @@ sub print_ovmf_commandline { } sub should_enroll_ms_2023_cert { - my ($efidisk_str) = @_; + my ($efidisk) = @_; - my $efidisk = parse_drive('efidisk0', $efidisk_str); return if !$efidisk->{'pre-enrolled-keys'}; return if $efidisk->{'ms-cert'} && $efidisk->{'ms-cert'} eq '2023'; @@ -289,11 +288,9 @@ sub should_enroll_ms_2023_cert { } sub ensure_ms_2023_cert_enrolled { - my ($storecfg, $vmid, $efidisk_str) = @_; + my ($storecfg, $vmid, $efidisk) = @_; - return if !should_enroll_ms_2023_cert($efidisk_str); - - my $efidisk = parse_drive('efidisk0', $efidisk_str); + return if !should_enroll_ms_2023_cert($efidisk); print "efidisk0: enrolling Microsoft UEFI CA 2023\n"; @@ -317,7 +314,7 @@ sub ensure_ms_2023_cert_enrolled { die "efidisk0: enrolling Microsoft UEFI CA 2023 failed - $err" if $err; $efidisk->{'ms-cert'} = '2023'; - return print_drive($efidisk); + return $efidisk; } 1; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel