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(), {}, {})