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
     1.1 --- a/tools/python/xen/xend/server/netif.py	Mon Sep 19 13:23:22 2005 +0000
     1.2 +++ b/tools/python/xen/xend/server/netif.py	Mon Sep 19 13:24:13 2005 +0000
     1.3 @@ -27,9 +27,6 @@ from xen.xend import sxp
     1.4  from xen.xend.server.DevController import DevController
     1.5  
     1.6  
     1.7 -next_devid = 1
     1.8 -
     1.9 -
    1.10  class NetifController(DevController):
    1.11      """Network interface controller. Handles all network devices for a domain.
    1.12      """
    1.13 @@ -41,8 +38,6 @@ class NetifController(DevController):
    1.14      def getDeviceDetails(self, config):
    1.15          """@see DevController.getDeviceDetails"""
    1.16  
    1.17 -        global next_devid
    1.18 -
    1.19          from xen.xend import XendRoot
    1.20          xroot = XendRoot.instance()
    1.21  
    1.22 @@ -52,9 +47,6 @@ class NetifController(DevController):
    1.23                  val.append(sxp.child0(ipaddr))
    1.24              return val
    1.25  
    1.26 -        devid = next_devid
    1.27 -        next_devid += 1
    1.28 -
    1.29          script = os.path.join(xroot.network_script_dir,
    1.30                                sxp.child_value(config, 'script',
    1.31                                                xroot.get_vif_script()))
    1.32 @@ -63,6 +55,8 @@ class NetifController(DevController):
    1.33          mac = sxp.child_value(config, 'mac')
    1.34          ipaddr = _get_config_ipaddr(config)
    1.35  
    1.36 +        devid = self.allocateDeviceID()
    1.37 +
    1.38          back = { 'script' : script,
    1.39                   'mac' : mac,
    1.40                   'bridge' : bridge,
     2.1 --- a/tools/python/xen/xend/server/usbif.py	Mon Sep 19 13:23:22 2005 +0000
     2.2 +++ b/tools/python/xen/xend/server/usbif.py	Mon Sep 19 13:24:13 2005 +0000
     2.3 @@ -25,9 +25,6 @@
     2.4  from xen.xend.server.DevController import DevController
     2.5  
     2.6  
     2.7 -next_devid = 1
     2.8 -
     2.9 -
    2.10  class UsbifController(DevController):
    2.11      """USB device interface controller. Handles all USB devices
    2.12      for a domain.
    2.13 @@ -42,9 +39,4 @@ class UsbifController(DevController):
    2.14      def getDeviceDetails(self, _):
    2.15          """@see DevController.getDeviceDetails"""
    2.16  
    2.17 -        global next_devid
    2.18 -
    2.19 -        devid = next_devid
    2.20 -        next_devid += 1
    2.21 -
    2.22 -        return (devid, {}, {})
    2.23 +        return (self.allocateDeviceID(), {}, {})