bitkeeper revision 1.1003 (40d8b8dc_YbEBn1ToXKOIMOG5-RsRw)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

1 files changed, 7 insertions, 1 deletions

diff --git a/tools/xenmgr/lib/server/SrvConsoleServer.py b/tools/xenmgr/lib/server/SrvConsoleServer.py
index 21d39140b2..7179a0d1d4 100644
--- a/tools/xenmgr/lib/server/SrvConsoleServer.py
+++ b/tools/xenmgr/lib/server/SrvConsoleServer.py
@@ -549,7 +549,7 @@ class Daemon:
         self.listenEvent()
         self.listenNotifier()
         self.listenVirq()
-        SrvServer.create()
+        SrvServer.create(bridge=1)
         reactor.run()
 
     def createFactories(self):
@@ -602,6 +602,9 @@ class Daemon:
         d = self.blkifCF.createInstance(dom)
         return d
 
+    def blkif_dev(self, dom, vdev):
+        return self.blkifCF.getDomainDevice(dom, vdev)
+
     def blkif_dev_create(self, dom, vdev, mode, segment):
         """Create a block device.
         
@@ -641,6 +644,9 @@ class Daemon:
         d = ctrl.attach_device(vif, vmac)
         return d
 
+    def netif_dev(self, dom, vif):
+        return self.netifCF.getDomainDevice(dom, vif)
+
     def console_create(self, dom, console_port=None):
         """Create a console for a domain.
         """