[Xen-changelog] merge?

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

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID e7c7196fa329a91c745c3e40546dc8b588ea0abb
# Parent  4d899a738d5958184aaa1880b08407e9dffebac6
# Parent  3cc679a35d7117b0ac5171686caeb5c28fee0933
merge?

diff -r 4d899a738d59 -r e7c7196fa329 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Tue Sep 13 15:05:49 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py   Tue Sep 13 15:46:49 2005
@@ -1170,8 +1170,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