[pve-devel] r6572 - qemu-server/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-12-05 10:47:30 +0100 (Mon, 05 Dec 2011)
New Revision: 6572

Modified:
   qemu-server/trunk/Makefile
   qemu-server/trunk/QemuServer.pm
   qemu-server/trunk/changelog.Debian
Log:
fixes for kvm 1.0


Modified: qemu-server/trunk/Makefile
===================================================================
--- qemu-server/trunk/Makefile	2011-12-05 06:05:50 UTC (rev 6571)
+++ qemu-server/trunk/Makefile	2011-12-05 09:47:30 UTC (rev 6572)
@@ -2,7 +2,7 @@
 
 VERSION=1.1
 PACKAGE=qemu-server
-PKGREL=32
+PKGREL=33
 
 DESTDIR=
 PREFIX=/usr

Modified: qemu-server/trunk/QemuServer.pm
===================================================================
--- qemu-server/trunk/QemuServer.pm	2011-12-05 06:05:50 UTC (rev 6571)
+++ qemu-server/trunk/QemuServer.pm	2011-12-05 09:47:30 UTC (rev 6572)
@@ -228,7 +228,7 @@
 
     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;
     }
 
@@ -1237,9 +1237,12 @@
     my $cmd = [];
 
     my $kvmver = kvm_user_version();
+
     my $vernum = 0; # unknown
     if ($kvmver =~ m/^(\d+)\.(\d+)\.(\d+)$/) {
 	$vernum = $1*1000000+$2*1000+$3;
+    } elsif ($kvmver =~ m/^(\d+)\.(\d+)$/) {
+	$vernum = $1*1000000+$2*1000;
     } else {
 	die "unable to parse kvm version '$kvmver'\n";
     }
@@ -1392,7 +1395,7 @@
     foreach my $ds (sort keys %$di) {
 	$use_virtio = 1 if $ds =~ m/^virtio/;
 	my $drive = $self->print_drive_full ($vmid, $di->{$ds});
-	$drive .= ",boot=on" if $conf->{bootdisk} && ($conf->{bootdisk} eq $ds);
+	$drive .= ",bootindex=1" if $conf->{bootdisk} && ($conf->{bootdisk} eq $ds);
 	push @$cmd, '-drive', $drive;
     }
 

Modified: qemu-server/trunk/changelog.Debian
===================================================================
--- qemu-server/trunk/changelog.Debian	2011-12-05 06:05:50 UTC (rev 6571)
+++ qemu-server/trunk/changelog.Debian	2011-12-05 09:47:30 UTC (rev 6572)
@@ -1,3 +1,9 @@
+qemu-server (1.1-33) unstable; urgency=low
+
+  * fixes for qemu-kvm 1.0
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 05 Dec 2011 10:46:16 +0100
+
 qemu-server (1.1-32) unstable; urgency=low
 
   * improve performance: correctly set 'dd' output block size