[Xen-changelog] Hack around problem whereby VMX domains (using the ioemu device) now fail

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 365245f2a106e147b8c25bf559c6566a9b98130e
# Parent  5d9de9f4baf449b37b922ef343e0627366f98082
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@xxxxxxxxxxxxx>

diff -r 5d9de9f4baf4 -r 365245f2a106 
tools/python/xen/xend/server/DevController.py
--- a/tools/python/xen/xend/server/DevController.py     Mon Nov  7 11:30:35 2005
+++ b/tools/python/xen/xend/server/DevController.py     Mon Nov  7 11:35:06 2005
@@ -57,6 +57,8 @@
         @return The ID for the newly created device.
         """
         (devid, back, front) = self.getDeviceDetails(config)
+        if devid is None:
+            return 0
 
         self.writeDetails(config, devid, back, front)
 
diff -r 5d9de9f4baf4 -r 365245f2a106 tools/python/xen/xend/server/blkif.py
--- a/tools/python/xen/xend/server/blkif.py     Mon Nov  7 11:30:35 2005
+++ b/tools/python/xen/xend/server/blkif.py     Mon Nov  7 11:35:06 2005
@@ -43,7 +43,7 @@
         
         dev = sxp.child_value(config, 'dev')
         if re.match('^ioemu:', dev):
-            return (0,{},{})
+            return (None,{},{})
 
         devid = blkif.blkdev_name_to_number(dev)
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog