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 0A0781FF14C for ; Fri, 26 Jun 2026 15:12:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 591D612064; Fri, 26 Jun 2026 15:11:54 +0200 (CEST) From: David Riley To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 10/10] fix #7294: helpers: use cluster-wide version helper Date: Fri, 26 Jun 2026 15:10:35 +0200 Message-ID: <20260626131035.112374-11-d.riley@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260626131035.112374-1-d.riley@proxmox.com> References: <20260626131035.112374-1-d.riley@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1782479473511 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.122 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 Message-ID-Hash: FBLW625YJIFX7ASJ2LYZ6XUNLS7NWPJX X-Message-ID-Hash: FBLW625YJIFX7ASJ2LYZ6XUNLS7NWPJX X-MailFrom: d.riley@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: Drop the local `version_cmp` and `pvecfg_min_version` implementations and update call sites to use the centralized tools module in pve-common. Link: https://bugzilla.proxmox.com/show_bug.cgi?id=7294 Signed-off-by: David Riley --- src/PVE/QemuMigrate.pm | 3 ++- src/PVE/QemuServer/Helpers.pm | 42 ++--------------------------------- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/src/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm index 8da6f15d..65950a8f 100644 --- a/src/PVE/QemuMigrate.pm +++ b/src/PVE/QemuMigrate.pm @@ -23,6 +23,7 @@ use PVE::Storage::Plugin; use PVE::Storage; use PVE::StorageTunnel; use PVE::Tools; +use PVE::Tools qw(pvecfg_min_version); use PVE::Tunnel; use PVE::QemuConfig; @@ -1400,7 +1401,7 @@ sub phase2 { # Check if target is new enough for having the port encoded in the proxy ticket. if ( $target_version - && PVE::QemuServer::Helpers::pvecfg_min_version($target_version, 9, 1, 9) + && PVE::Tools::pvecfg_min_version($target_version, 9, 1, 9) ) { $ticket_port = $spice_port; } diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm index dd17eef5..c0db925b 100644 --- a/src/PVE/QemuServer/Helpers.pm +++ b/src/PVE/QemuServer/Helpers.pm @@ -11,6 +11,7 @@ use PVE::Cluster; use PVE::INotify; use PVE::ProcFSTools; use PVE::Tools; +use PVE::Tools qw(version_cmp); use base 'Exporter'; our @EXPORT_OK = qw( @@ -228,39 +229,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; @@ -307,19 +282,6 @@ sub get_node_pvecfg_version { return $version_info->{version}; } -sub pvecfg_min_version { - my ($verstr, $major, $minor, $release) = @_; - - return 0 if !$verstr; - - if ($verstr =~ m/^(\d+)\.(\d+)(?:[.-](\d+))?/) { - return 1 if version_cmp($1, $major, $2, $minor, $3 // 0, $release) >= 0; - return 0; - } - - die "internal error: cannot check version of invalid string '$verstr'"; -} - sub parse_number_sets { my ($set) = @_; my $res = []; -- 2.47.3