[Xen-changelog] Ever since patchset 8648 (xen-unstable.hg) all my configuration files

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 11ed48af31d70d93764d2b7826754e29d5e0f801
# Parent  f4fc2736289293cc37c8a89a362824d6cffdd5ad

Ever since patchset 8648 (xen-unstable.hg) all my configuration files
fail with the following:

Error: Device 768 (vbd) could not be connected. Hotplug scripts not working.

(Since my HVM tree follows xen-unstable.hg closely, it breaks too).

The following patch undoes a small part of Ke Yu's patch and fixes the
problem.

However, I'm having trouble understanding what this part did in the
original patch. Was there a subtle change in the disk variable format
that I missed?

Signed-Off-By: Leendert van Doorn <leendert@xxxxxxxxxxxxxx>

diff -r f4fc27362892 -r 11ed48af31d7 tools/python/xen/xend/server/blkif.py
--- a/tools/python/xen/xend/server/blkif.py     Sun Jan 29 09:49:38 2006
+++ b/tools/python/xen/xend/server/blkif.py     Sun Jan 29 09:52:43 2006
@@ -42,6 +42,10 @@
         """@see DevController.getDeviceDetails"""
 
         dev = sxp.child_value(config, 'dev')
+        if 'ioemu:' in dev:
+            return (None,{},{})
+
+        devid = blkif.blkdev_name_to_number(dev)
 
         (typ, params) = string.split(sxp.child_value(config, 'uname'), ':', 1)
         back = { 'dev'    : dev,
@@ -50,13 +54,7 @@
                  'mode'   : sxp.child_value(config, 'mode', 'r')
                  }
 
-        if 'ioemu:' in dev:
-            (dummy, dev1) = string.split(dev, ':', 1)
-            devid = blkif.blkdev_name_to_number(dev1)
-            front = {}
-        else:
-            devid = blkif.blkdev_name_to_number(dev)
-            front = { 'virtual-device' : "%i" % devid }
+        front = { 'virtual-device' : "%i" % devid }
 
         return (devid, back, front)
 

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