From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 30 Jun 2008 09:01:44 +0000 (+0100)
Subject: Fix up python breakage for blkdev_name_to_number
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14192^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2bb1ceab627d0207734181cd64aae209523ee400;p=xen.git

Fix up python breakage for blkdev_name_to_number

Signed-off-by: Chris Lalancette <clalance@redhat.com>
---

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: