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 73711A10A9 for ; Fri, 10 Nov 2023 14:25:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 57647700 for ; Fri, 10 Nov 2023 14:24:56 +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 for ; Fri, 10 Nov 2023 14:24:55 +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 C595B47AA3 for ; Fri, 10 Nov 2023 14:24:54 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 10 Nov 2023 14:24:47 +0100 Message-Id: <20231110132451.67482-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231110132451.67482-1-f.ebner@proxmox.com> References: <20231110132451.67482-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.079 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH qemu-server 2/6] machine: get current: make it clear that pve-version only exists for the current machine 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: Fri, 10 Nov 2023 13:25:26 -0000 by adding a comment and grouping the code better. See the PVE QEMU patch "PVE: Allow version code in machine type" for reference. The way the code was written previously made it look like a bug where $pve_version might be overwritten multiple times. Signed-off-by: Fiona Ebner --- PVE/QemuServer/Machine.pm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm index a4bc24a5..85cfb89c 100644 --- a/PVE/QemuServer/Machine.pm +++ b/PVE/QemuServer/Machine.pm @@ -21,14 +21,16 @@ sub machine_type_is_q35 { sub current_from_query_machines { my ($machines) = @_; - my ($current, $pve_version, $default); + my ($current, $default); for my $machine ($machines->@*) { $default = $machine->{name} if $machine->{'is-default'}; - $current = $machine->{name} if $machine->{'is-current'}; - $pve_version = $machine->{'pve-version'} if $machine->{'pve-version'}; - } - $current .= "+$pve_version" if $current && $pve_version; + if ($machine->{'is-current'}) { + $current = $machine->{name}; + # pve-version only exists for the current machine + $current .= "+$machine->{'pve-version'}" if $machine->{'pve-version'}; + } + } # fallback to the default machine if current is not supported by qemu return $current || $default || 'pc'; -- 2.39.2