ia64/xen-unstable
changeset 6808:72e4e2aab342
merge?
line diff
55.1 --- a/tools/python/xen/xend/XendDomainInfo.py Tue Sep 13 15:33:37 2005 +0000 55.2 +++ b/tools/python/xen/xend/XendDomainInfo.py Tue Sep 13 15:48:19 2005 +0000 55.3 @@ -811,7 +811,6 @@ class XendDomainInfo: 55.4 self.store_channel = self.eventChannel("store/port") 55.5 self.console_channel = self.eventChannel("console/port") 55.6 55.7 - 55.8 def create_configured_devices(self): 55.9 devices = sxp.children(self.config, 'device') 55.10 for d in devices: 55.11 @@ -1165,8 +1164,9 @@ config_handlers = { 55.12 #============================================================================ 55.13 # Register device controllers and their device config types. 55.14 55.15 -controller.addDevControllerClass("vbd", server.blkif.BlkifController) 55.16 -controller.addDevControllerClass("vif", server.netif.NetifController) 55.17 -controller.addDevControllerClass("vtpm", server.tpmif.TPMifController) 55.18 -controller.addDevControllerClass("pci", server.pciif.PciController) 55.19 -controller.addDevControllerClass("usb", server.usbif.UsbifController) 55.20 +from xen.xend.server import blkif, netif, tpmif, pciif, usbif 55.21 +controller.addDevControllerClass("vbd", blkif.BlkifController) 55.22 +controller.addDevControllerClass("vif", netif.NetifController) 55.23 +controller.addDevControllerClass("vtpm", tpmif.TPMifController) 55.24 +controller.addDevControllerClass("pci", pciif.PciController) 55.25 +controller.addDevControllerClass("usb", usbif.UsbifController)