From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4A9C165EC9 for ; Wed, 9 Mar 2022 11:10:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B16D31B923 for ; Wed, 9 Mar 2022 11:09:28 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 867D81B801 for ; Wed, 9 Mar 2022 11:09:25 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5F25E46418 for ; Wed, 9 Mar 2022 11:09:25 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 9 Mar 2022 11:09:10 +0100 Message-Id: <20220309100919.31512-9-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309100919.31512-1-f.ebner@proxmox.com> References: <20220309100919.31512-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.124 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v12 qemu-server 08/16] efivars size: allow overriding efidisk parameter 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: , X-List-Received-Date: Wed, 09 Mar 2022 10:10:02 -0000 For disk import, it should be based on the disk properties that are passed in rather than on those of a possibly pre-existing disk in the config. Signed-off-by: Fabian Ebner --- New in v12. PVE/QemuServer.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index b98ed3d..b246602 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -7703,9 +7703,10 @@ sub qemu_use_old_bios_files { } sub get_efivars_size { - my ($conf) = @_; + my ($conf, $efidisk) = @_; + my $arch = get_vm_arch($conf); - my $efidisk = $conf->{efidisk0} ? parse_drive('efidisk0', $conf->{efidisk0}) : undef; + $efidisk //= $conf->{efidisk0} ? parse_drive('efidisk0', $conf->{efidisk0}) : undef; my $smm = PVE::QemuServer::Machine::machine_type_is_q35($conf); my (undef, $ovmf_vars) = get_ovmf_files($arch, $efidisk, $smm); die "uefi vars image '$ovmf_vars' not found\n" if ! -f $ovmf_vars; -- 2.30.2