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 C07C5A1102 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 A0D0C702 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 5108D47AA8 for ; Fri, 10 Nov 2023 14:24:55 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 10 Nov 2023 14:24:49 +0100 Message-Id: <20231110132451.67482-6-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 4/6] machine: get current: add flag if current machine is deprecated in list context 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 Will be used for a warning. Signed-off-by: Fiona Ebner --- PVE/QemuServer/Machine.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm index c9fc9a3d..13721ae8 100644 --- a/PVE/QemuServer/Machine.pm +++ b/PVE/QemuServer/Machine.pm @@ -18,6 +18,7 @@ sub machine_type_is_q35 { return $conf->{machine} && ($conf->{machine} =~ m/q35/) ? 1 : 0; } +# In list context, also returns whether the current machine is deprecated or not. sub current_from_query_machines { my ($machines) = @_; @@ -29,15 +30,17 @@ sub current_from_query_machines { $current = $machine->{name}; # pve-version only exists for the current machine $current .= "+$machine->{'pve-version'}" if $machine->{'pve-version'}; - return $current; + return wantarray ? ($current, $machine->{deprecated} ? 1 : 0) : $current; } } - # fallback to the default machine if current is not supported by qemu - return $default || 'pc'; + # fallback to the default machine if current is not supported by qemu - assume never deprecated + my $fallback = $default || 'pc'; + return wantarray ? ($fallback, 0) : $fallback; } -# this only works if VM is running +# This only works if VM is running. +# In list context, also returns whether the current machine is deprecated or not. sub get_current_qemu_machine { my ($vmid) = @_; -- 2.39.2