diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-06-30 10:01:44 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-06-30 10:01:44 +0100 |
| commit | 2bb1ceab627d0207734181cd64aae209523ee400 (patch) | |
| tree | 0629bcf3b25cdfeab4467b137cf73a8e785e13f2 /tools | |
| parent | 53a29c4ca785bd3d69e49d9b883796d2f1569f9f (diff) | |
| download | xen-2bb1ceab627d0207734181cd64aae209523ee400.tar.gz xen-2bb1ceab627d0207734181cd64aae209523ee400.tar.bz2 xen-2bb1ceab627d0207734181cd64aae209523ee400.zip | |
Fix up python breakage for blkdev_name_to_number
Signed-off-by: Chris Lalancette <clalance@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/python/xen/util/blkif.py | 2 | ||||
| -rw-r--r-- | tools/python/xen/xend/XendConfig.py | 2 | ||||
| -rw-r--r-- | tools/xm-test/lib/XmTestLib/block_utils.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/python/xen/util/blkif.py b/tools/python/xen/util/blkif.py index 82149bf9df..7e4bad5648 100644 --- a/tools/python/xen/util/blkif.py +++ b/tools/python/xen/util/blkif.py @@ -63,7 +63,7 @@ def blkdev_segment(name): type: 'Disk' or identifying name for partition type """ val = None - n = blkdev_name_to_number(name) + (name, n) = blkdev_name_to_number(name) if not n is None: val = { 'device' : n, 'start_sector' : long(0), diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index 2aae44ef5e..d31783f9a9 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -1123,7 +1123,7 @@ class XendConfig(dict): try: devid = int(dev2) except ValueError: - devid = blkdev_name_to_number(dev2) + (xenbus, devid) = blkdev_name_to_number(dev2) if devid == None: log.debug("The device %s is not device name", dev2) return None diff --git a/tools/xm-test/lib/XmTestLib/block_utils.py b/tools/xm-test/lib/XmTestLib/block_utils.py index c315c17bd1..58124c832a 100644 --- a/tools/xm-test/lib/XmTestLib/block_utils.py +++ b/tools/xm-test/lib/XmTestLib/block_utils.py @@ -15,7 +15,7 @@ __all__ = [ "block_attach", "block_detach" ] def get_state(domain, devname): - number = xen.util.blkif.blkdev_name_to_number(devname) + (path, number) = xen.util.blkif.blkdev_name_to_number(devname) s, o = traceCommand("xm block-list %s | awk '/^%d/ {print $4}'" % (domain.getName(), number)) if s != 0: |