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 370BE1FF16B for ; Thu, 6 Mar 2025 11:45:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7126B461; Thu, 6 Mar 2025 11:45:05 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 6 Mar 2025 11:44:56 +0100 Message-Id: <20250306104459.1272297-6-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 5/8] machine: incorporate pve machine version when pinning 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 creating or updating guests with ostype windows, we want to pin the machine version to a specific one. Since introduction of that feature, we never bumped the pve machine version, so this was missing. Append the pve machine version if it's not 0 so we don't add that unnecessarily. Signed-off-by: Dominik Csapak --- PVE/QemuServer/Machine.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm index e3da8e21..ebaf2dcc 100644 --- a/PVE/QemuServer/Machine.pm +++ b/PVE/QemuServer/Machine.pm @@ -274,7 +274,17 @@ sub check_and_pin_machine_string { if (!$machine || $machine =~ m/^(?:pc|q35|virt)$/) { # always pin Windows' machine version on create, they get confused too easily if (PVE::QemuServer::Helpers::windows_version($ostype)) { - $machine_conf->{type} = windows_get_pinned_machine_version($machine); + my $kvmversion = PVE::QemuServer::Helpers::kvm_user_version(); + my $pin_version = get_installed_machine_version($kvmversion); + + # pin to the current pveX version to make use of most current features if > 0 + my $pvever = get_pve_version($kvmversion); + if ($pvever > 0) { + $pin_version .= "+pve$pvever"; + } + + $machine_conf->{type} = windows_get_pinned_machine_version($machine, $pin_version, $kvmversion); + print "pinning machine type to '$machine_conf->{type}' for Windows guest OS\n"; } } -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel