From 09b1142906123ef2426425536e07e1af78235b8a Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 25 Feb 2016 14:47:17 +0100 Subject: [PATCH] kvm_user_version: update code to use our framework 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 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 0fcbead8..491116d4 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -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;