[PATCH v3 qemu-server 3/6] helpers: optionally get package version for kvm_user_version()

[Christian Ebner <c.ebner@proxmox.com>]

Allows to specify whether to return the binary version or the package
version by adding a flag to kvm_user_version(). This will allow
comparing the package version including it's revision when the binary
version is not enough. Regex matching is performed on both, the
package version being kept as optional for full backwards compatibility
in the binary version check case.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
changes since version 2:
- precompile regex via qr
- adapt binary version regex variable name
- add dedicated regex for package version, dropping subversion and
  therefore only matching major.minor.micro-rel
- keep package version regex matching optional for full backwards
  compat in binary version check case

 src/PVE/QemuServer/Helpers.pm | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm
index ebb1a874..8047d9e6 100644
--- a/src/PVE/QemuServer/Helpers.pm
+++ b/src/PVE/QemuServer/Helpers.pm
@@ -53,29 +53,42 @@ my $kvm_user_version = {};
 my $kvm_mtime = {};
 
 sub kvm_user_version {
-    my ($binary) = @_;
+    my ($binary, $query_package_version) = @_;
 
     $binary //= get_command_for_arch(get_host_arch()); # get the native arch by default
     my $st = stat($binary);
 
     my $cachedmtime = $kvm_mtime->{$binary} // -1;
-    return $kvm_user_version->{$binary}
-        if defined($kvm_user_version->{$binary})
-        && $cachedmtime == $st->mtime;
+    my $version_type = $query_package_version ? 'package' : 'version';
+    if (defined($kvm_user_version->{$binary}->{$version_type}) && $cachedmtime == $st->mtime) {
+        return $kvm_user_version->{$binary}->{$version_type};
+    }
 
     $kvm_mtime->{$binary} = $st->mtime;
 
+    my $binary_version_re = qr/(\d+\.\d+(\.\d+)?)(\.\d+)?/;
+    my $package_version_re = qr/\(pve-qemu-kvm_(\d+\.\d+(\.\d+)?-\d+)\)/;
+
     my $code = sub {
         my $line = shift;
-        if ($line =~ m/^QEMU( PC)? emulator version (\d+\.\d+(\.\d+)?)(\.\d+)?[,\s]/) {
-            $kvm_user_version->{$binary} = $2;
+        if ($line =~
+            m/^QEMU( PC)? emulator version $binary_version_re[,\s]($package_version_re)?/
+        ) {
+            $kvm_user_version->{$binary} = {
+                version => $2,
+                package => $6,
+            };
         }
     };
 
     eval { PVE::Tools::run_command([$binary, '--version'], outfunc => $code); };
     warn $@ if $@;
 
-    return defined($kvm_user_version->{$binary}) ? $kvm_user_version->{$binary} : 'unknown';
+    if (defined($kvm_user_version->{$binary}->{$version_type})) {
+        return $kvm_user_version->{$binary}->{$version_type};
+    }
+
+    return 'unknown';
 }
 
 # Paths and directories
-- 
2.47.3