[Xen-changelog] [xen-unstable] Fix up python breakage for blkdev_name_to_number

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1214816504 -3600
# Node ID c5875621d79a7216d09fe94a8d8c581a9fb3c8c8
# Parent  fbccdd7e2a86c71e59c0d0680c50474da3140a6b
Fix up python breakage for blkdev_name_to_number

Signed-off-by: Chris Lalancette <clalance@xxxxxxxxxx>
---
 tools/python/xen/util/blkif.py             |    2 +-
 tools/python/xen/xend/XendConfig.py        |    2 +-
 tools/xm-test/lib/XmTestLib/block_utils.py |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff -r fbccdd7e2a86 -r c5875621d79a tools/python/xen/util/blkif.py
--- a/tools/python/xen/util/blkif.py    Mon Jun 30 10:00:53 2008 +0100
+++ b/tools/python/xen/util/blkif.py    Mon Jun 30 10:01:44 2008 +0100
@@ -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 -r fbccdd7e2a86 -r c5875621d79a tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Mon Jun 30 10:00:53 2008 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Mon Jun 30 10:01:44 2008 +0100
@@ -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 -r fbccdd7e2a86 -r c5875621d79a tools/xm-test/lib/XmTestLib/block_utils.py
--- a/tools/xm-test/lib/XmTestLib/block_utils.py        Mon Jun 30 10:00:53 
2008 +0100
+++ b/tools/xm-test/lib/XmTestLib/block_utils.py        Mon Jun 30 10:01:44 
2008 +0100
@@ -15,7 +15,7 @@ __all__ = [ "block_attach", "block_detac
 
 
 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:

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