[pve-devel] [PATCH 1/2] do not set romfile= if network is not in boot order

Stefan Priebe s.priebe at profihost.ag
Fri Jan 9 06:56:14 CET 2015


Signed-off-by: Stefan Priebe <s.priebe at profihost.ag>
---
 PVE/QemuServer.pm |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 73c1266..857d925 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -1256,11 +1256,8 @@ sub print_netdevice_full {
          $device = 'virtio-net-pci';
      };
 
-    # qemu > 0.15 always try to boot from network - we disable that by
-    # not loading the pxe rom file
-    my $extra = ($bootorder !~ m/n/) ? "romfile=," : '';
     my $pciaddr = print_pci_addr("$netid", $bridges);
-    my $tmpstr = "$device,${extra}mac=$net->{macaddr},netdev=$netid$pciaddr,id=$netid";
+    my $tmpstr = "$device,mac=$net->{macaddr},netdev=$netid$pciaddr,id=$netid";
     if ($net->{queues} && $net->{queues} > 1 && $net->{model} eq 'virtio'){
 	#Consider we have N queues, the number of vectors needed is 2*N + 2 (plus one config interrupt and control vq)
 	my $vectors = $net->{queues} * 2 + 2;
-- 
1.7.10.4




More information about the pve-devel mailing list