diff options
author | akw27@labyrinth.cl.cam.ac.uk <akw27@labyrinth.cl.cam.ac.uk> | 2004-11-16 12:58:33 +0000 |
---|---|---|
committer | akw27@labyrinth.cl.cam.ac.uk <akw27@labyrinth.cl.cam.ac.uk> | 2004-11-16 12:58:33 +0000 |
commit | 896fb4d9cc5ccd42fe0255b1c383d2db45d42755 (patch) | |
tree | 5c91078ed4e38323c955e1828de72c3c0c42847e /tools | |
parent | 370136bb6c51a6308380f9fd71dfa07d42cdad5f (diff) | |
download | xen-896fb4d9cc5ccd42fe0255b1c383d2db45d42755.tar.gz xen-896fb4d9cc5ccd42fe0255b1c383d2db45d42755.tar.bz2 xen-896fb4d9cc5ccd42fe0255b1c383d2db45d42755.zip |
bitkeeper revision 1.1159.170.28 (4199f979RH9YDYvR9XUZksaNnSlnLQ)
Fixes to xend for backends in domains other than dom0.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/python/xen/xend/XendDomainInfo.py | 13 | ||||
-rwxr-xr-x | tools/python/xen/xend/server/blkif.py | 2 | ||||
-rwxr-xr-x | tools/python/xen/xend/server/netif.py | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 70cd68db1c..963a0c8ea8 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -971,8 +971,8 @@ class XendDomainInfo: @return: deferred - calls callback with vm """ - d = self.create_blkif() - d.addCallback(lambda x: self.create_devices()) + d = self.create_devices() + d.addCallback(lambda x: self.create_blkif()) d.addCallback(self._configure) return d @@ -994,9 +994,12 @@ class XendDomainInfo: @return: deferred """ - ctrl = xend.blkif_create(self.dom, recreate=self.recreate) - back = ctrl.getBackendInterface(0) - return back.connect(recreate=self.recreate) + if (self.get_devices("vbd") == None): + ctrl = xend.blkif_create(self.dom, recreate=self.recreate) + back = ctrl.getBackendInterface(0) + return back.connect(recreate=self.recreate) + else: + return None def dom_construct(self, dom, config): """Construct a vm for an existing domain. diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py index 1e06c55345..c17c0c568e 100755 --- a/tools/python/xen/xend/server/blkif.py +++ b/tools/python/xen/xend/server/blkif.py @@ -187,7 +187,7 @@ class BlkifBackendInterface(controller.BackendInterface): self.writeRequest(msg, response=response) def connectInterface(self, val): - self.evtchn = channel.eventChannel(0, self.controller.dom) + self.evtchn = channel.eventChannel(self.dom, self.controller.dom) log.debug("Connecting blkif to event channel %s ports=%d:%d", str(self), self.evtchn['port1'], self.evtchn['port2']) msg = packMsg('blkif_be_connect_t', diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py index a0466b0e4c..9732702c53 100755 --- a/tools/python/xen/xend/server/netif.py +++ b/tools/python/xen/xend/server/netif.py @@ -307,7 +307,7 @@ class NetDev(controller.SplitDev): def recv_fe_interface_connect(self, val, req): if not req: return - self.evtchn = channel.eventChannel(0, self.controller.dom) + self.evtchn = channel.eventChannel(self.dom, self.controller.dom) msg = packMsg('netif_be_connect_t', { 'domid' : self.controller.dom, 'netif_handle' : self.vif, |