ia64/xen-unstable

changeset 6960:c0c96a494c76

merge?
author cl349@firebug.cl.cam.ac.uk
date Mon Sep 19 13:24:13 2005 +0000 (2005-09-19)
parents b5bf198f0113 adbe7d45472b
children 3133e64d0462
files docs/Makefile tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in tools/python/pylintrc tools/python/xen/sv/Main.py tools/python/xen/sv/Wizard.py tools/python/xen/xend/Args.py tools/python/xen/xend/EventServer.py tools/python/xen/xend/Vifctl.py tools/python/xen/xend/XendCheckpoint.py tools/python/xen/xend/XendDomain.py tools/python/xen/xend/XendDomainInfo.py tools/python/xen/xend/image.py tools/python/xen/xend/scheduler.py tools/python/xen/xend/server/DevController.py tools/python/xen/xend/server/SrvDaemon.py tools/python/xen/xend/server/SrvDomainDir.py tools/python/xen/xend/server/SrvNode.py tools/python/xen/xend/server/SrvServer.py tools/python/xen/xend/server/blkif.py tools/python/xen/xend/server/channel.py tools/python/xen/xend/server/event.py tools/python/xen/xend/server/netif.py tools/python/xen/xend/server/pciif.py tools/python/xen/xend/server/tpmif.py tools/python/xen/xend/server/usbif.py tools/python/xen/xend/xenstore/xsobj.py tools/python/xen/xend/xenstore/xstransact.py tools/python/xen/xend/xenstore/xswatch.py tools/python/xen/xm/create.py xen/arch/x86/shadow.c xen/arch/x86/shadow32.c xen/arch/x86/shadow_public.c xen/include/asm-x86/shadow.h
line diff
    23.1 --- a/tools/python/xen/xend/server/netif.py	Mon Sep 19 13:23:22 2005 +0000
    23.2 +++ b/tools/python/xen/xend/server/netif.py	Mon Sep 19 13:24:13 2005 +0000
    23.3 @@ -27,9 +27,6 @@ from xen.xend import sxp
    23.4  from xen.xend.server.DevController import DevController
    23.5  
    23.6  
    23.7 -next_devid = 1
    23.8 -
    23.9 -
   23.10  class NetifController(DevController):
   23.11      """Network interface controller. Handles all network devices for a domain.
   23.12      """
   23.13 @@ -41,8 +38,6 @@ class NetifController(DevController):
   23.14      def getDeviceDetails(self, config):
   23.15          """@see DevController.getDeviceDetails"""
   23.16  
   23.17 -        global next_devid
   23.18 -
   23.19          from xen.xend import XendRoot
   23.20          xroot = XendRoot.instance()
   23.21  
   23.22 @@ -52,9 +47,6 @@ class NetifController(DevController):
   23.23                  val.append(sxp.child0(ipaddr))
   23.24              return val
   23.25  
   23.26 -        devid = next_devid
   23.27 -        next_devid += 1
   23.28 -
   23.29          script = os.path.join(xroot.network_script_dir,
   23.30                                sxp.child_value(config, 'script',
   23.31                                                xroot.get_vif_script()))
   23.32 @@ -63,6 +55,8 @@ class NetifController(DevController):
   23.33          mac = sxp.child_value(config, 'mac')
   23.34          ipaddr = _get_config_ipaddr(config)
   23.35  
   23.36 +        devid = self.allocateDeviceID()
   23.37 +
   23.38          back = { 'script' : script,
   23.39                   'mac' : mac,
   23.40                   'bridge' : bridge,
    26.1 --- a/tools/python/xen/xend/server/usbif.py	Mon Sep 19 13:23:22 2005 +0000
    26.2 +++ b/tools/python/xen/xend/server/usbif.py	Mon Sep 19 13:24:13 2005 +0000
    26.3 @@ -25,9 +25,6 @@
    26.4  from xen.xend.server.DevController import DevController
    26.5  
    26.6  
    26.7 -next_devid = 1
    26.8 -
    26.9 -
   26.10  class UsbifController(DevController):
   26.11      """USB device interface controller. Handles all USB devices
   26.12      for a domain.
   26.13 @@ -42,9 +39,4 @@ class UsbifController(DevController):
   26.14      def getDeviceDetails(self, _):
   26.15          """@see DevController.getDeviceDetails"""
   26.16  
   26.17 -        global next_devid
   26.18 -
   26.19 -        devid = next_devid
   26.20 -        next_devid += 1
   26.21 -
   26.22 -        return (devid, {}, {})
   26.23 +        return (self.allocateDeviceID(), {}, {})