From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 033821FF0C1 for ; Fri, 18 Sep 2026 18:10:41 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 15AF121548; Fri, 18 Sep 2026 18:08:57 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v3 11/21] helpers: move version_cmp() helper to pve-common Date: Fri, 18 Sep 2026 18:08:17 +0200 Message-ID: <20260918160841.128088-12-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918160841.128088-1-f.ebner@proxmox.com> References: <20260918160841.128088-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1789747730034 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.591 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: UWHSKFE64GZ5YWXQGUHAOMV6XMYKSFPU X-Message-ID-Hash: UWHSKFE64GZ5YWXQGUHAOMV6XMYKSFPU X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Fiona Ebner --- New in v3. src/PVE/QemuServer/Helpers.pm | 30 ++---------------------------- src/PVE/QemuServer/Machine.pm | 13 +++++-------- src/PVE/QemuServer/QMPHelpers.pm | 5 +++-- 3 files changed, 10 insertions(+), 38 deletions(-) diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm index dd17eef5..a39e4abf 100644 --- a/src/PVE/QemuServer/Helpers.pm +++ b/src/PVE/QemuServer/Helpers.pm @@ -228,39 +228,13 @@ sub min_version { my ($verstr, $major, $minor, $pve) = @_; if ($verstr =~ m/^(\d+)\.(\d+)(?:\.(\d+))?(?:\+pve(\d+))?/) { - return 1 if version_cmp($1, $major, $2, $minor, $4, $pve) >= 0; + return 1 if PVE::Tools::version_cmp($1, $major, $2, $minor, $4, $pve) >= 0; return 0; } die "internal error: cannot check version of invalid string '$verstr'"; } -# gets in pairs the versions you want to compares, i.e.: -# ($a-major, $b-major, $a-minor, $b-minor, $a-extra, $b-extra, ...) -# returns 0 if same, -1 if $a is older than $b, +1 if $a is newer than $b -sub version_cmp { - my @versions = @_; - - my $size = scalar(@versions); - - return 0 if $size == 0; - - if ($size & 1) { - my (undef, $fn, $line) = caller(0); - die "cannot compare odd count of versions, called from $fn:$line\n"; - } - - for (my $i = 0; $i < $size; $i += 2) { - my ($left, $right) = splice(@versions, 0, 2); - $left //= 0; - $right //= 0; - - return 1 if $left > $right; - return -1 if $left < $right; - } - return 0; -} - sub config_aware_timeout { my ($config, $memory, $is_suspended) = @_; my $timeout = 30; @@ -313,7 +287,7 @@ sub pvecfg_min_version { return 0 if !$verstr; if ($verstr =~ m/^(\d+)\.(\d+)(?:[.-](\d+))?/) { - return 1 if version_cmp($1, $major, $2, $minor, $3 // 0, $release) >= 0; + return 1 if PVE::Tools::version_cmp($1, $major, $2, $minor, $3 // 0, $release) >= 0; return 0; } diff --git a/src/PVE/QemuServer/Machine.pm b/src/PVE/QemuServer/Machine.pm index 35161d1f..2e8e57b4 100644 --- a/src/PVE/QemuServer/Machine.pm +++ b/src/PVE/QemuServer/Machine.pm @@ -3,6 +3,8 @@ package PVE::QemuServer::Machine; use strict; use warnings; +use PVE::Tools; + use PVE::QemuServer::Helpers; use PVE::QemuServer::MetaInfo; use PVE::QemuServer::Monitor; @@ -298,13 +300,8 @@ sub machine_version_cmp { my ($major_a, $minor_a, $pve_a) = extract_version_parts($machine_type_a); my ($major_b, $minor_b, $pve_b) = extract_version_parts($machine_type_b); - return PVE::QemuServer::Helpers::version_cmp( - $major_a, - $major_b, - $minor_a, - $minor_b, - $pve_a, - $pve_b, + return PVE::Tools::version_cmp( + $major_a, $major_b, $minor_a, $minor_b, $pve_a, $pve_b, ); } @@ -345,7 +342,7 @@ sub can_run_pve_machine_version { my $pvever = $3; $kvmversion =~ m/(\d+)\.(\d+)/; - return 0 if PVE::QemuServer::Helpers::version_cmp($1, $major, $2, $minor) < 0; + return 0 if PVE::Tools::version_cmp($1, $major, $2, $minor) < 0; # if $pvever is missing or 0, we definitely support it as long as we didn't # fail the QEMU version check above diff --git a/src/PVE/QemuServer/QMPHelpers.pm b/src/PVE/QemuServer/QMPHelpers.pm index f474c123..f83b41e2 100644 --- a/src/PVE/QemuServer/QMPHelpers.pm +++ b/src/PVE/QemuServer/QMPHelpers.pm @@ -2,7 +2,8 @@ package PVE::QemuServer::QMPHelpers; use v5.36; -use PVE::QemuServer::Helpers; +use PVE::Tools; + use PVE::QemuServer::Monitor qw(mon_cmd); use base 'Exporter'; @@ -59,7 +60,7 @@ sub runs_at_least_qemu_version($vmid, $major, $minor, $extra = undef) { die "could not query currently running version for VM $vmid\n" if !defined($v); $v = $v->{qemu}; - return PVE::QemuServer::Helpers::version_cmp( + return PVE::Tools::version_cmp( $v->{major}, $major, $v->{minor}, $minor, $v->{micro}, $extra, ) >= 0; } -- 2.47.3