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 770C31FF16F for ; Tue, 14 Oct 2025 16:40:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 84E087782; Tue, 14 Oct 2025 16:39:58 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 14 Oct 2025 16:39:22 +0200 Message-ID: <20251014143946.160679-12-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251014143946.160679-1-f.ebner@proxmox.com> References: <20251014143946.160679-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760452753002 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.021 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 11/16] machine: include +pve version when getting installed machine version 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" Move the code attaching the +pve version from the single call site into the get_installed_machine_version() helper. Rename the helper to latest_installed_machine_version() to make it a bit more explicit. This is in preparation for the upcoming qemu-storage-daemon functionality re-using this helper. Signed-off-by: Fiona Ebner --- src/PVE/QemuServer/Machine.pm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/PVE/QemuServer/Machine.pm b/src/PVE/QemuServer/Machine.pm index b2ff7e24..719b134d 100644 --- a/src/PVE/QemuServer/Machine.pm +++ b/src/PVE/QemuServer/Machine.pm @@ -308,11 +308,17 @@ sub qemu_machine_pxe { return $machine; } -sub get_installed_machine_version { +sub latest_installed_machine_version { my ($kvmversion) = @_; + $kvmversion = PVE::QemuServer::Helpers::kvm_user_version() if !defined($kvmversion); - $kvmversion =~ m/^(\d+\.\d+)/; - return $1; + + my ($version) = ($kvmversion =~ m/^(\d+\.\d+)/); + + my $pvever = get_pve_version($version); + $version .= "+pve$pvever" if $pvever > 0; + + return $version; } sub windows_get_pinned_machine_version { @@ -320,12 +326,7 @@ sub windows_get_pinned_machine_version { my $pin_version = $base_version; if (!defined($base_version) || !can_run_pve_machine_version($base_version, $kvmversion)) { - $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($pin_version); - if ($pvever > 0) { - $pin_version .= "+pve$pvever"; - } + $pin_version = latest_installed_machine_version($kvmversion); } if (!$machine || $machine eq 'pc') { $machine = "pc-i440fx-$pin_version"; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel