ia64/xen-unstable

changeset 15996:3a799196ff69

xend: fix server/netif.py so that it respects type=None.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
author Keir Fraser <keir@xensource.com>
date Thu Sep 27 17:44:03 2007 +0100 (2007-09-27)
parents 9c567284436e
children 8817a53c030f
files tools/python/xen/xend/server/netif.py
line diff
     1.1 --- a/tools/python/xen/xend/server/netif.py	Thu Sep 27 16:50:52 2007 +0100
     1.2 +++ b/tools/python/xen/xend/server/netif.py	Thu Sep 27 17:44:03 2007 +0100
     1.3 @@ -115,17 +115,15 @@ class NetifController(DevController):
     1.4          accel   = config.get('accel')
     1.5          sec_lab = config.get('security_label')
     1.6  
     1.7 -        if not typ:
     1.8 -            typ = xoptions.netback_type
     1.9 -
    1.10          if not mac:
    1.11              raise VmError("MAC address not specified or generated.")
    1.12  
    1.13          devid = self.allocateDeviceID()
    1.14  
    1.15          back = { 'script' : script,
    1.16 -                 'mac'    : mac,
    1.17 -                 'type'   : typ }
    1.18 +                 'mac'    : mac }
    1.19 +        if typ:
    1.20 +            back['type'] = typ
    1.21          if ipaddr:
    1.22              back['ip'] = ipaddr
    1.23          if bridge: