[Xen-changelog] [xen-3.1-testing] xend: fix server/netif.py so that it respects type=None.

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1190991738 -3600
# Node ID 8c1042c6cdeac8621ba4991dc6500fc16fd81581
# Parent  687ce253a0f4e2fc151db59bf5775b7ba78b7966
xend: fix server/netif.py so that it respects type=None.
Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
xen-unstable changeset:   15972:3a799196ff69d3a3d5e4a891c13434aa61ce60a9
xen-unstable date:        Thu Sep 27 17:44:03 2007 +0100
---
 tools/python/xen/xend/server/netif.py |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff -r 687ce253a0f4 -r 8c1042c6cdea tools/python/xen/xend/server/netif.py
--- a/tools/python/xen/xend/server/netif.py     Wed Sep 26 10:05:02 2007 +0100
+++ b/tools/python/xen/xend/server/netif.py     Fri Sep 28 16:02:18 2007 +0100
@@ -108,17 +108,15 @@ class NetifController(DevController):
         ipaddr  = config.get('ip')
         model   = config.get('model')
 
-        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:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog