# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 34932eb3f63b6c971504680c3ee8e0e5db07566a
# Parent  de881276da129733b936c6882cd275aac7580a90
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 de881276da12 -r 34932eb3f63b tools/python/xen/xend/server/DevController.py
--- a/tools/python/xen/xend/server/DevController.py	Fri Nov  4 16:39:15 2005
+++ b/tools/python/xen/xend/server/DevController.py	Fri Nov  4 16:42:22 2005
@@ -57,8 +57,8 @@
         @return The ID for the newly created device.
         """
         (devid, back, front) = self.getDeviceDetails(config)
-        if devid == 0:
-            return devid
+        if devid == None:
+            return 0
 
         self.writeDetails(config, devid, back, front)
 
diff -r de881276da12 -r 34932eb3f63b tools/python/xen/xend/server/blkif.py
--- a/tools/python/xen/xend/server/blkif.py	Fri Nov  4 16:39:15 2005
+++ b/tools/python/xen/xend/server/blkif.py	Fri Nov  4 16:42:22 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)