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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-12 08:45:23 +0200 (Fri, 12 Aug 2011)
New Revision: 6463

Modified:
   qemu-server/trunk/ChangeLog
   qemu-server/trunk/Makefile
   qemu-server/trunk/QemuServer.pm
   qemu-server/trunk/changelog.Debian
Log:
	* QemuServer.pm (config_to_command): fix for 0.15.0 - supress network boot



Modified: qemu-server/trunk/ChangeLog
===================================================================
--- qemu-server/trunk/ChangeLog	2011-08-11 09:31:59 UTC (rev 6462)
+++ qemu-server/trunk/ChangeLog	2011-08-12 06:45:23 UTC (rev 6463)
@@ -1,3 +1,7 @@
+2011-08-12  Proxmox Support Team  <support at proxmox.com>
+
+	* QemuServer.pm (config_to_command): fix for 0.15.0 - supress network boot
+
 2011-03-15  Proxmox Support Team  <support at proxmox.com>
 
 	* QemuServer.pm (print_drive_full): use 'cache=none' for raw

Modified: qemu-server/trunk/Makefile
===================================================================
--- qemu-server/trunk/Makefile	2011-08-11 09:31:59 UTC (rev 6462)
+++ qemu-server/trunk/Makefile	2011-08-12 06:45:23 UTC (rev 6463)
@@ -2,7 +2,7 @@
 
 VERSION=1.1
 PACKAGE=qemu-server
-PKGREL=30
+PKGREL=31
 
 DESTDIR=
 PREFIX=/usr

Modified: qemu-server/trunk/QemuServer.pm
===================================================================
--- qemu-server/trunk/QemuServer.pm	2011-08-11 09:31:59 UTC (rev 6462)
+++ qemu-server/trunk/QemuServer.pm	2011-08-12 06:45:23 UTC (rev 6463)
@@ -1435,7 +1435,11 @@
 		} else {
 		    $ifname = "${ifname}d$j";
 		    push @$cmd, '-netdev', "type=tap,id=${k}d$j,ifname=${ifname},script=/var/lib/qemu-server/bridge-vlan$vhostparam";
-		    push @$cmd, '-device', "$device,mac=$nic->{macaddr},netdev=${k}d$j";
+		    # qemu 0.15 always try to boot from network - we disable that by
+		    # not loading the pxe rom file
+		    my $extra = (($vernum >= 15000) && (!$conf->{boot} || ($conf->{boot} !~ m/n/))) ?
+			"romfile=," : '';
+		    push @$cmd, '-device', "$device,${extra}mac=$nic->{macaddr},netdev=${k}d$j";
 		}
 
 		# kvm uses TUNSETIFF ioctl, and that limits ifname length

Modified: qemu-server/trunk/changelog.Debian
===================================================================
--- qemu-server/trunk/changelog.Debian	2011-08-11 09:31:59 UTC (rev 6462)
+++ qemu-server/trunk/changelog.Debian	2011-08-12 06:45:23 UTC (rev 6463)
@@ -1,3 +1,9 @@
+qemu-server (1.1-31) unstable; urgency=low
+
+  * small fixes for new qemu-kvm 0.15.0
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 12 Aug 2011 08:44:16 +0200
+
 qemu-server (1.1-30) unstable; urgency=low
 
   * use 'cache=none' for raw images and devices to improve performance.