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 B25C11FF16B for ; Tue, 12 Aug 2025 16:38:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C6B2A10346; Tue, 12 Aug 2025 16:39:37 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 12 Aug 2025 16:37:40 +0200 Message-ID: <20250812143900.138723-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250812143900.138723-1-f.ebner@proxmox.com> References: <20250812143900.138723-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1755009513476 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.025 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server v2 2/5] code cleanup: cfg2cmd: check if configuration is for template centrally 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" Signed-off-by: Fiona Ebner --- src/PVE/QemuServer.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index d6657a1f..67db9bc3 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -3205,9 +3205,11 @@ sub config_to_command { my ($forcemachine, $forcecpu, $live_restore_backing, $dry_run) = $options->@{qw(force-machine force-cpu live-restore-backing dry-run)}; + my $is_template = PVE::QemuConfig->is_template($conf); + # minimize config for templates, they can only start for backup, # so most options besides the disks are irrelevant - if (PVE::QemuConfig->is_template($conf)) { + if ($is_template) { my $newconf = { template => 1, # in case below code checks that kvm => 0, # to prevent an error on hosts without virtualization extensions @@ -3361,7 +3363,6 @@ sub config_to_command { 'machine-version' => $machine_version, q35 => $q35, }; - my $is_template = PVE::QemuConfig->is_template($conf); my ($ovmf_cmd, $ovmf_machine_flags) = PVE::QemuServer::OVMF::print_ovmf_commandline( $conf, $storecfg, $vmid, $hw_info, $version_guard, $is_template, ); @@ -3463,7 +3464,7 @@ sub config_to_command { # Add a TPM only if the VM is not a template, # to support backing up template VMs even if the TPM disk is write-protected. - add_tpm_device($vmid, $devices, $conf) if (!PVE::QemuConfig->is_template($conf)); + add_tpm_device($vmid, $devices, $conf) if !$is_template; my $sockets = 1; $sockets = $conf->{smp} if $conf->{smp}; # old style - no longer iused @@ -3900,7 +3901,7 @@ sub config_to_command { print "activating and using '$vmstate' as vmstate\n"; } - if (PVE::QemuConfig->is_template($conf)) { + if ($is_template) { # needed to workaround base volumes being read-only push @$cmd, '-snapshot'; } -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel