ia64/xen-unstable

changeset 7646:365245f2a106

Hack around problem whereby VMX domains (using the ioemu device) now fail
because the new hotplug script error checking kicks in.

ioemu really ought to move out of blkif.py.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author emellor@leeni.uk.xensource.com
date Mon Nov 07 12:35:06 2005 +0100 (2005-11-07)
parents 5d9de9f4baf4
children ecb5997f7b25
files tools/python/xen/xend/server/DevController.py tools/python/xen/xend/server/blkif.py
line diff
     1.1 --- a/tools/python/xen/xend/server/DevController.py	Mon Nov 07 12:30:35 2005 +0100
     1.2 +++ b/tools/python/xen/xend/server/DevController.py	Mon Nov 07 12:35:06 2005 +0100
     1.3 @@ -57,6 +57,8 @@ class DevController:
     1.4          @return The ID for the newly created device.
     1.5          """
     1.6          (devid, back, front) = self.getDeviceDetails(config)
     1.7 +        if devid is None:
     1.8 +            return 0
     1.9  
    1.10          self.writeDetails(config, devid, back, front)
    1.11  
     2.1 --- a/tools/python/xen/xend/server/blkif.py	Mon Nov 07 12:30:35 2005 +0100
     2.2 +++ b/tools/python/xen/xend/server/blkif.py	Mon Nov 07 12:35:06 2005 +0100
     2.3 @@ -43,7 +43,7 @@ class BlkifController(DevController):
     2.4          
     2.5          dev = sxp.child_value(config, 'dev')
     2.6          if re.match('^ioemu:', dev):
     2.7 -            return (0,{},{})
     2.8 +            return (None,{},{})
     2.9  
    2.10          devid = blkif.blkdev_name_to_number(dev)
    2.11