From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 5 Aug 2008 08:29:42 +0000 (+0100)
Subject: xend: remove default NIC in qemu when no vif configured
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14165^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=45f66e11cc2fd740762e43a5b41318ebc316b471;p=xen.git

xend: remove default NIC in qemu when no vif configured

Latest QEMU would add a NIC device by default, unless specify the
"-nic none". So end user still get a unusable NIC even no vif in the
config file.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 3b1fc4225c..49cce20225 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -777,6 +777,10 @@ class HVMImageHandler(ImageHandler):
             ret.append("tap,vlan=%d,ifname=tap%d.%d,bridge=%s" %
                        (nics, self.vm.getDomid(), nics-1, bridge))
 
+        if nics == 0:
+            ret.append("-net")
+            ret.append("none")
+
         return ret
 
     def getDeviceModelArgs(self, restore = False):