aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKeir Fraser <keir@xensource.com>2007-09-27 17:44:03 +0100
committerKeir Fraser <keir@xensource.com>2007-09-27 17:44:03 +0100
commitcd76c0a1edd26aed8ad9bdb8144b20e0b335cea2 (patch)
treec1e7821fbc13e3e141c2ceec07cb550377730174 /tools
parent0d68d7c0fad3f6547413eddcd22bacaa65550d2b (diff)
downloadxen-cd76c0a1edd26aed8ad9bdb8144b20e0b335cea2.tar.gz
xen-cd76c0a1edd26aed8ad9bdb8144b20e0b335cea2.tar.bz2
xen-cd76c0a1edd26aed8ad9bdb8144b20e0b335cea2.zip
xend: fix server/netif.py so that it respects type=None.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/python/xen/xend/server/netif.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py
index fbf059b9fb..250fa848a0 100644
--- a/tools/python/xen/xend/server/netif.py
+++ b/tools/python/xen/xend/server/netif.py
@@ -115,17 +115,15 @@ class NetifController(DevController):
accel = config.get('accel')
sec_lab = config.get('security_label')
- if not typ:
- typ = xoptions.netback_type
-
if not mac:
raise VmError("MAC address not specified or generated.")
devid = self.allocateDeviceID()
back = { 'script' : script,
- 'mac' : mac,
- 'type' : typ }
+ 'mac' : mac }
+ if typ:
+ back['type'] = typ
if ipaddr:
back['ip'] = ipaddr
if bridge: