1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Tue Sep 13 15:33:37 2005 +0000
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Tue Sep 13 15:48:19 2005 +0000
     1.3 @@ -811,7 +811,6 @@ class XendDomainInfo:
     1.4          self.store_channel = self.eventChannel("store/port")
     1.5          self.console_channel = self.eventChannel("console/port")
     1.6  
     1.7 -
     1.8      def create_configured_devices(self):
     1.9          devices = sxp.children(self.config, 'device')
    1.10          for d in devices:
    1.11 @@ -1165,8 +1164,9 @@ config_handlers = {
    1.12  #============================================================================
    1.13  # Register device controllers and their device config types.
    1.14  
    1.15 -controller.addDevControllerClass("vbd",  server.blkif.BlkifController)
    1.16 -controller.addDevControllerClass("vif",  server.netif.NetifController)
    1.17 -controller.addDevControllerClass("vtpm", server.tpmif.TPMifController)
    1.18 -controller.addDevControllerClass("pci",  server.pciif.PciController)
    1.19 -controller.addDevControllerClass("usb",  server.usbif.UsbifController)
    1.20 +from xen.xend.server import blkif, netif, tpmif, pciif, usbif
    1.21 +controller.addDevControllerClass("vbd",  blkif.BlkifController)
    1.22 +controller.addDevControllerClass("vif",  netif.NetifController)
    1.23 +controller.addDevControllerClass("vtpm", tpmif.TPMifController)
    1.24 +controller.addDevControllerClass("pci",  pciif.PciController)
    1.25 +controller.addDevControllerClass("usb",  usbif.UsbifController)