ia64/xen-unstable

changeset 8697:11ed48af31d7

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@watson.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Sun Jan 29 10:52:43 2006 +0100 (2006-01-29)
parents f4fc27362892
children d05c39dcc374
files tools/python/xen/xend/server/blkif.py
line diff
     1.1 --- a/tools/python/xen/xend/server/blkif.py	Sun Jan 29 10:49:38 2006 +0100
     1.2 +++ b/tools/python/xen/xend/server/blkif.py	Sun Jan 29 10:52:43 2006 +0100
     1.3 @@ -42,6 +42,10 @@ class BlkifController(DevController):
     1.4          """@see DevController.getDeviceDetails"""
     1.5  
     1.6          dev = sxp.child_value(config, 'dev')
     1.7 +        if 'ioemu:' in dev:
     1.8 +            return (None,{},{})
     1.9 +
    1.10 +        devid = blkif.blkdev_name_to_number(dev)
    1.11  
    1.12          (typ, params) = string.split(sxp.child_value(config, 'uname'), ':', 1)
    1.13          back = { 'dev'    : dev,
    1.14 @@ -50,13 +54,7 @@ class BlkifController(DevController):
    1.15                   'mode'   : sxp.child_value(config, 'mode', 'r')
    1.16                   }
    1.17  
    1.18 -        if 'ioemu:' in dev:
    1.19 -            (dummy, dev1) = string.split(dev, ':', 1)
    1.20 -            devid = blkif.blkdev_name_to_number(dev1)
    1.21 -            front = {}
    1.22 -        else:
    1.23 -            devid = blkif.blkdev_name_to_number(dev)
    1.24 -            front = { 'virtual-device' : "%i" % devid }
    1.25 +        front = { 'virtual-device' : "%i" % devid }
    1.26  
    1.27          return (devid, back, front)
    1.28