ia64/xen-unstable

changeset 17928:c5875621d79a

Fix up python breakage for blkdev_name_to_number

Signed-off-by: Chris Lalancette <clalance@redhat.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Jun 30 10:01:44 2008 +0100 (2008-06-30)
parents fbccdd7e2a86
children 81d47e75ce1a
files tools/python/xen/util/blkif.py tools/python/xen/xend/XendConfig.py tools/xm-test/lib/XmTestLib/block_utils.py
line diff
     1.1 --- a/tools/python/xen/util/blkif.py	Mon Jun 30 10:00:53 2008 +0100
     1.2 +++ b/tools/python/xen/util/blkif.py	Mon Jun 30 10:01:44 2008 +0100
     1.3 @@ -63,7 +63,7 @@ def blkdev_segment(name):
     1.4          type:         'Disk' or identifying name for partition type
     1.5      """
     1.6      val = None
     1.7 -    n = blkdev_name_to_number(name)
     1.8 +    (name, n) = blkdev_name_to_number(name)
     1.9      if not n is None:
    1.10          val = { 'device'       : n,
    1.11                  'start_sector' : long(0),
     2.1 --- a/tools/python/xen/xend/XendConfig.py	Mon Jun 30 10:00:53 2008 +0100
     2.2 +++ b/tools/python/xen/xend/XendConfig.py	Mon Jun 30 10:01:44 2008 +0100
     2.3 @@ -1123,7 +1123,7 @@ class XendConfig(dict):
     2.4              try:
     2.5                  devid = int(dev2)
     2.6              except ValueError:
     2.7 -                devid = blkdev_name_to_number(dev2)
     2.8 +                (xenbus, devid) = blkdev_name_to_number(dev2)
     2.9                  if devid == None:
    2.10                      log.debug("The device %s is not device name", dev2)
    2.11                      return None
     3.1 --- a/tools/xm-test/lib/XmTestLib/block_utils.py	Mon Jun 30 10:00:53 2008 +0100
     3.2 +++ b/tools/xm-test/lib/XmTestLib/block_utils.py	Mon Jun 30 10:01:44 2008 +0100
     3.3 @@ -15,7 +15,7 @@ import xen.util.blkif
     3.4  
     3.5  
     3.6  def get_state(domain, devname):
     3.7 -    number = xen.util.blkif.blkdev_name_to_number(devname)
     3.8 +    (path, number) = xen.util.blkif.blkdev_name_to_number(devname)
     3.9      s, o = traceCommand("xm block-list %s | awk '/^%d/ {print $4}'" %
    3.10                          (domain.getName(), number))
    3.11      if s != 0: