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 D2C4D1FF187 for ; Tue, 18 Nov 2025 13:35:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D0801134F5; Tue, 18 Nov 2025 13:35:23 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 18 Nov 2025 13:34:39 +0100 Message-ID: <20251118123516.112546-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251118123516.112546-1-f.ebner@proxmox.com> References: <20251118123516.112546-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763469290254 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.017 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [ovmf.pm] Subject: [pve-devel] [PATCH qemu-server 1/4] ovmf: enroll ms 2023 cert: change QSD ID to allow calling outside of VM start 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" The main QSD instance with ID $vmid can only be re-used as part of VM start tasks. In preparation to allow calling the method from a new enroll-efi-keys command/endpoint, change the QSD ID to something else. Signed-off-by: Fiona Ebner --- src/PVE/QemuServer/OVMF.pm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/PVE/QemuServer/OVMF.pm b/src/PVE/QemuServer/OVMF.pm index 408144a0..409ad022 100644 --- a/src/PVE/QemuServer/OVMF.pm +++ b/src/PVE/QemuServer/OVMF.pm @@ -278,8 +278,6 @@ sub print_ovmf_commandline { return ($cmd, $machine_flags); } -# May only be called as part of VM start right now, because it uses the main QSD associated to the -# VM. If required for another scenario, change the QSD ID to something else. sub ensure_ms_2023_cert_enrolled { my ($storecfg, $vmid, $efidisk_str) = @_; @@ -289,19 +287,22 @@ sub ensure_ms_2023_cert_enrolled { print "efidisk0: enrolling Microsoft UEFI CA 2023\n"; - my $new_qsd = !PVE::QemuServer::Helpers::qsd_running_locally($vmid); - PVE::QemuServer::QSD::start($vmid) if $new_qsd; + my $qsd_id = "vm-$vmid-efi-enroll"; + if (my $qsd_pid = PVE::QemuServer::Helpers::qsd_running_locally($qsd_id)) { + die "QEMU storage daemon $qsd_id already running with PID $qsd_pid (left over process?)\n"; + } + PVE::QemuServer::QSD::start($qsd_id); eval { my $efi_vars_path = - PVE::QemuServer::QSD::add_fuse_export($vmid, $efidisk, 'efidisk0-enroll'); + PVE::QemuServer::QSD::add_fuse_export($qsd_id, $efidisk, 'efidisk0-enroll'); PVE::Tools::run_command( ['virt-fw-vars', '--inplace', $efi_vars_path, '--distro-keys', 'ms-uefi']); - PVE::QemuServer::QSD::remove_fuse_export($vmid, 'efidisk0-enroll'); + PVE::QemuServer::QSD::remove_fuse_export($qsd_id, 'efidisk0-enroll'); }; my $err = $@; - PVE::QemuServer::QSD::quit($vmid) if $new_qsd; + PVE::QemuServer::QSD::quit($qsd_id); die "efidisk0: enrolling Microsoft UEFI CA 2023 failed - $err" if $err; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel