proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2026-01-01 00:01:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix version parser for qemu-kvm 1.0

Browse Source
This commit is contained in:
Dietmar Maurer 2011-12-07 11:16:57 +01:00
parent 16e903f2dc
commit a3c5221310
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/QemuServer.pm
View File

@ -590,7 +590,7 @@ sub kvm_user_version {
my $tmp = `kvm -help 2>/dev/null`;
if ($tmp =~ m/^QEMU( PC)? emulator version (\d+\.\d+\.\d+) /) {
if ($tmp =~ m/^QEMU( PC)? emulator version (\d+\.\d+(\.\d+)?) /) {
$kvm_user_version = $2;
}
@ -1927,11 +1927,13 @@ sub config_to_command {
my $pciaddr = '';
my $kvmver = kvm_user_version();
my $vernum = 0; # unknown
if ($kvmver =~ m/^(\d+)\.(\d+)\.(\d+)$/) {
if ($kvmver =~ m/^(\d+)\.(\d+)$/) {
$vernum = $1*1000000+$2*1000;
} elsif ($kvmver =~ m/^(\d+)\.(\d+)\.(\d+)$/) {
$vernum = $1*1000000+$2*1000+$3;
}
die "detected old qemu-kvm binary ($kvmver)\n" if $vernum < 14000;
die "detected old qemu-kvm binary ($kvmver)\n" if $vernum < 15000;
my $have_ovz = -f '/proc/vz/vestat';