]> git.proxmox.com Git - qemu-server.git/commitdiff
kvm_user_version: update code to use our framework
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Thu, 25 Feb 2016 13:47:17 +0000 (14:47 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Fri, 26 Feb 2016 06:54:35 +0000 (07:54 +0100)
Replace backticks with run_command and also do not use
`kvm -help` which produces a lot of unecessary output, lets use
`kvm -version` instead.

PVE/QemuServer.pm

index 0fcbead8c87a02b80a9042e26c61b40d7568be20..491116d4f81541feb3a1f86f96a68302d88cd096 100644 (file)
@@ -883,11 +883,15 @@ sub kvm_user_version {
 
     $kvm_user_version = 'unknown';
 
-    my $tmp = `kvm -help 2>/dev/null`;
+    my $code = sub {
+       my $line = shift;
+       if ($line =~ m/^QEMU( PC)? emulator version (\d+\.\d+(\.\d+)?)(\.\d+)?[,\s]/) {
+           $kvm_user_version = $2;
+       }
+    };
 
-    if ($tmp =~ m/^QEMU( PC)? emulator version (\d+\.\d+(\.\d+)?)(\.\d+)?[,\s]/) {
-       $kvm_user_version = $2;
-    }
+    eval { run_command("kvm -version", outfunc => $code); };
+    warn $@ if $@;
 
     return $kvm_user_version;