ia64/xen-unstable

changeset 3021:687594c02d83

bitkeeper revision 1.1159.177.1 (419b7973GQNMdTb87C7Uq9su5ForCA)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Wed Nov 17 16:16:51 2004 +0000 (2004-11-17)
parents d0006e7baa9a f3db24b0b8c9
children 401d110b812b cf2447c5a0c6 15785f25998e dbf307f6b2ca
files .hgtags tools/python/xen/xend/server/netif.py
line diff
     1.1 --- a/.hgtags	Wed Nov 17 13:48:07 2004 +0000
     1.2 +++ b/.hgtags	Wed Nov 17 16:16:51 2004 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  42882b3e0dda89f3a8ec00da568f86e9b3c230f1 RELEASE-2.0.0
     1.5 -c7aaf4f106858ddae28341c1351caffde8aeaac8 RELEASE-2.0.1
     1.6 +475a162b66e2c19b1e9468b234a4ba705334905e RELEASE-2.0.1
     1.7  487b2ee37d1cecb5f3e7a546b05ad097a0226f2f beta1
     1.8  3d330e41f41ce1bc118c02346e18949ad5d67f6b latest-semistable
     1.9  30c521db4c71960b0cf1d9c9e1b658e77b535a3e latest-stable
     2.1 --- a/tools/python/xen/xend/server/netif.py	Wed Nov 17 13:48:07 2004 +0000
     2.2 +++ b/tools/python/xen/xend/server/netif.py	Wed Nov 17 16:16:51 2004 +0000
     2.3 @@ -104,7 +104,6 @@ class NetDev(controller.SplitDev):
     2.4          self.evtchn = None
     2.5          self.configure(config)
     2.6          self.status = NETIF_INTERFACE_STATUS_DISCONNECTED
     2.7 -        self.dom = ctrl.dom
     2.8  
     2.9      def _get_config_mac(self, config):
    2.10          vmac = sxp.child_value(config, 'mac')
    2.11 @@ -308,7 +307,7 @@ class NetDev(controller.SplitDev):
    2.12      
    2.13      def recv_fe_interface_connect(self, val, req):
    2.14          if not req: return
    2.15 -        self.evtchn = channel.eventChannel(self.dom, self.controller.dom)
    2.16 +        self.evtchn = channel.eventChannel(self.backendDomain, self.controller.dom)
    2.17          msg = packMsg('netif_be_connect_t',
    2.18                        { 'domid'          : self.controller.dom,
    2.19                          'netif_handle'   : self.vif,