[Xen-changelog] merge?

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 72e4e2aab342044fb2c17dd1923706eafd563a49
# Parent  8ca0f98ba8e20d35c1f91ee1ca09af56a8cc3eb3
# Parent  e7c7196fa329a91c745c3e40546dc8b588ea0abb
merge?

diff -r 8ca0f98ba8e2 -r 72e4e2aab342 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Tue Sep 13 15:33:37 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py   Tue Sep 13 15:48:19 2005
@@ -811,7 +811,6 @@
         self.store_channel = self.eventChannel("store/port")
         self.console_channel = self.eventChannel("console/port")
 
-
     def create_configured_devices(self):
         devices = sxp.children(self.config, 'device')
         for d in devices:
@@ -1165,8 +1164,9 @@
 #============================================================================
 # Register device controllers and their device config types.
 
-controller.addDevControllerClass("vbd",  server.blkif.BlkifController)
-controller.addDevControllerClass("vif",  server.netif.NetifController)
-controller.addDevControllerClass("vtpm", server.tpmif.TPMifController)
-controller.addDevControllerClass("pci",  server.pciif.PciController)
-controller.addDevControllerClass("usb",  server.usbif.UsbifController)
+from xen.xend.server import blkif, netif, tpmif, pciif, usbif
+controller.addDevControllerClass("vbd",  blkif.BlkifController)
+controller.addDevControllerClass("vif",  netif.NetifController)
+controller.addDevControllerClass("vtpm", tpmif.TPMifController)
+controller.addDevControllerClass("pci",  pciif.PciController)
+controller.addDevControllerClass("usb",  usbif.UsbifController)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog