mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 02:30:03 +01:00
merge?
This commit is contained in:
cl349@firebug.cl.cam.ac.uk committed
commit
232f9bd51e
1 file changed
+6
-5
@@ -1170,8 +1170,9 @@ config_handlers = {
|
||||
#============================================================================
|
||||
# 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)
|
||||