ia64/xen-unstable

changeset 6796:e7c7196fa329

merge?
author cl349@firebug.cl.cam.ac.uk
date Tue Sep 13 15:46:49 2005 +0000 (2005-09-13)
parents 4d899a738d59 3cc679a35d71
children b35215021b32 72e4e2aab342
files .hgignore Makefile buildconfigs/mk.linux-2.6-xen buildconfigs/mk.linux-2.6-xen0 buildconfigs/mk.linux-2.6-xenU docs/Doxyfile docs/Doxyfilter docs/Makefile docs/pythfilter.py extras/mini-os/include/hypervisor.h linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c linux-2.6-xen-sparse/drivers/xen/console/console.c linux-2.6-xen-sparse/drivers/xen/evtchn/evtchn.c linux-2.6-xen-sparse/drivers/xen/netback/loopback.c linux-2.6-xen-sparse/drivers/xen/netback/xenbus.c linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c linux-2.6-xen-sparse/drivers/xen/usbback/usbback.c linux-2.6-xen-sparse/drivers/xen/usbfront/usbfront.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypercall.h linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h linux-2.6-xen-sparse/include/asm-xen/evtchn.h linux-2.6-xen-sparse/mkbuildtree tools/console/daemon/io.c tools/console/daemon/main.c tools/console/daemon/utils.c tools/examples/Makefile tools/examples/block-enbd tools/examples/block-file tools/examples/xen-backend.agent tools/ioemu/hw/pcnet.c tools/ioemu/target-i386-dm/Makefile tools/libxc/xc_linux_restore.c tools/libxc/xc_private.c tools/libxc/xc_vmx_build.c tools/python/Makefile tools/python/pylintrc tools/python/xen/sv/DomInfo.py tools/python/xen/xend/XendDomainInfo.py tools/python/xen/xend/XendVnet.py tools/python/xen/xend/scheduler.py tools/python/xen/xend/server/controller.py tools/python/xen/xm/create.py tools/xenstore/Makefile tools/xenstore/fake_libxc.c tools/xenstore/testsuite/07watch.test tools/xenstore/testsuite/14complexperms.test tools/xenstore/xenstore_client.c tools/xenstore/xenstored_core.c tools/xenstore/xenstored_domain.c tools/xenstore/xenstored_domain.h tools/xenstore/xenstored_watch.c tools/xenstore/xs.c tools/xenstore/xs_lib.c tools/xenstore/xs_test.c xen/Makefile xen/arch/x86/domain.c xen/arch/x86/shadow.c xen/arch/x86/shadow32.c xen/arch/x86/shadow_public.c xen/arch/x86/traps.c xen/arch/x86/vmx.c xen/arch/x86/vmx_intercept.c xen/arch/x86/vmx_io.c xen/arch/x86/vmx_platform.c xen/arch/x86/vmx_vmcs.c xen/arch/x86/x86_32/entry.S xen/arch/x86/x86_64/entry.S xen/arch/x86/x86_64/traps.c xen/common/memory.c xen/include/asm-x86/shadow_64.h xen/include/asm-x86/shadow_ops.h xen/include/asm-x86/vmx.h xen/include/asm-x86/vmx_platform.h xen/include/asm-x86/vmx_virpit.h
line diff
    52.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Tue Sep 13 15:05:49 2005 +0000
    52.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Tue Sep 13 15:46:49 2005 +0000
    52.3 @@ -1170,8 +1170,9 @@ config_handlers = {
    52.4  #============================================================================
    52.5  # Register device controllers and their device config types.
    52.6  
    52.7 -controller.addDevControllerClass("vbd",  server.blkif.BlkifController)
    52.8 -controller.addDevControllerClass("vif",  server.netif.NetifController)
    52.9 -controller.addDevControllerClass("vtpm", server.tpmif.TPMifController)
   52.10 -controller.addDevControllerClass("pci",  server.pciif.PciController)
   52.11 -controller.addDevControllerClass("usb",  server.usbif.UsbifController)
   52.12 +from xen.xend.server import blkif, netif, tpmif, pciif, usbif
   52.13 +controller.addDevControllerClass("vbd",  blkif.BlkifController)
   52.14 +controller.addDevControllerClass("vif",  netif.NetifController)
   52.15 +controller.addDevControllerClass("vtpm", tpmif.TPMifController)
   52.16 +controller.addDevControllerClass("pci",  pciif.PciController)
   52.17 +controller.addDevControllerClass("usb",  usbif.UsbifController)