From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0CA761FF16B for ; Thu, 6 Mar 2025 11:46:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BB4CB75C; Thu, 6 Mar 2025 11:45:35 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 6 Mar 2025 11:44:55 +0100 Message-Id: <20250306104459.1272297-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250306104459.1272297-1-d.csapak@proxmox.com> References: <20250306104459.1272297-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 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 Subject: [pve-devel] [PATCH qemu-server 4/8] machine: correctly select pve machine version for non pinned windows guests 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" when we don't have a specific machine version on a windows guest, we use the creation meta info to pin the machine version. Currently we always append the pve machine version from the current installed kvm version, which is not necessarily the version we pinned the guest to. Instead, use either the info from the creation meta info if it exists, or use 'pve0'. For non-windows machines, we used the current QEMU machine version so we should use the pve machine version from that too. Signed-off-by: Dominik Csapak --- PVE/QemuServer/Machine.pm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm index f1acde8f..e3da8e21 100644 --- a/PVE/QemuServer/Machine.pm +++ b/PVE/QemuServer/Machine.pm @@ -237,14 +237,19 @@ sub get_vm_machine { if (PVE::QemuServer::Helpers::min_version($meta->{'creation-qemu'}, 9, 1)) { # need only major.minor ($base_version) = ($meta->{'creation-qemu'} =~ m/^(\d+.\d+)/); + # append pve machine version if we have one + if (my $pvever = $meta->{'creation-pve-machine'}) { + $base_version .= "+pve$pvever" + } } } $machine = windows_get_pinned_machine_version($machine, $base_version, $kvmversion); + } else{ + $arch //= 'x86_64'; + $machine ||= default_machine_for_arch($arch); + my $pvever = get_pve_version($kvmversion); + $machine .= "+pve$pvever"; } - $arch //= 'x86_64'; - $machine ||= default_machine_for_arch($arch); - my $pvever = get_pve_version($kvmversion); - $machine .= "+pve$pvever"; } if ($machine !~ m/\+pve\d+?(?:\.pxe)?$/) { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel