[PATCH qemu-server v2 10/10] fix #7294: helpers: use cluster-wide version helper

[David Riley <d.riley@proxmox.com>]

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 <d.riley@proxmox.com>
---
 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