ia64/xen-unstable

changeset 3559:80651f13b9c0

bitkeeper revision 1.1159.233.1 (41f910e9AmctVZRfu78RAYbPnw3W8g)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Thu Jan 27 16:03:53 2005 +0000 (2005-01-27)
parents 8059196efb90 77732aef762e
children 20c37da2d56b
files linux-2.6.10-xen-sparse/drivers/xen/netfront/netfront.c tools/python/xen/xend/XendDomainInfo.py tools/python/xen/xend/server/netif.py
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/netfront/netfront.c	Thu Jan 27 13:47:18 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/netfront/netfront.c	Thu Jan 27 16:03:53 2005 +0000
     1.3 @@ -1295,8 +1295,7 @@ static int __init netif_init(void)
     1.4  {
     1.5      int err = 0;
     1.6  
     1.7 -    if ( (xen_start_info.flags & SIF_INITDOMAIN) ||
     1.8 -         (xen_start_info.flags & SIF_NET_BE_DOMAIN) )
     1.9 +    if ( xen_start_info.flags & SIF_INITDOMAIN )
    1.10          return 0;
    1.11  
    1.12      IPRINTK("Initialising virtual ethernet driver.\n");
     2.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Thu Jan 27 13:47:18 2005 +0000
     2.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Thu Jan 27 16:03:53 2005 +0000
     2.3 @@ -457,9 +457,9 @@ class XendDomainInfo:
     2.4  
     2.5              self.init_domain()
     2.6              self.configure_console()
     2.7 +            self.configure_backends()
     2.8              self.construct_image()
     2.9              self.configure_restart()
    2.10 -            self.configure_backends()
    2.11              deferred = self.configure()
    2.12              def cberr(err):
    2.13                  self.destroy()
     3.1 --- a/tools/python/xen/xend/server/netif.py	Thu Jan 27 13:47:18 2005 +0000
     3.2 +++ b/tools/python/xen/xend/server/netif.py	Thu Jan 27 16:03:53 2005 +0000
     3.3 @@ -140,7 +140,8 @@ class NetDev(controller.SplitDev):
     3.4          self.ipaddr = self._get_config_ipaddr(config) or []
     3.5          
     3.6          try:
     3.7 -            self.backendDomain = int(sxp.child_value(config, 'backend', '0'))
     3.8 +            xd = get_component('xen.xend.XendDomain')
     3.9 +            self.backendDomain = int(xd.domain_lookup(sxp.child_value(config, 'backend', '0')).id)
    3.10          except:
    3.11              raise XendError('invalid backend domain')
    3.12  
    3.13 @@ -161,7 +162,8 @@ class NetDev(controller.SplitDev):
    3.14          bridge = sxp.child_value(config, 'bridge')
    3.15          script = sxp.child_value(config, 'script')
    3.16          ipaddr = self._get_config_ipaddr(config)
    3.17 -        backendDomain = sxp.child_value(config, 'backend', '0')
    3.18 +        xd = get_component('xen.xend.XendDomain')
    3.19 +        backendDomain = str(xd.domain_lookup(sxp.child_value(config, 'backend', '0')).id)
    3.20          if (mac is not None) and (mac != self.mac):
    3.21              raise XendError("cannot change mac")
    3.22          if (backendDomain is not None) and (backendDomain != str(self.backendDomain)):