From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Lalancette Subject: [PATCH]: Fix up python breakage for blkdev_name_to_number Date: Mon, 30 Jun 2008 08:42:35 +0200 Message-ID: <4868805B.8020309@redhat.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080207090307090800080202" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------080207090307090800080202 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Stefan Berger pointed out that xm-test was having failures with the new blkdev_name_to_number code. I found that I had forgotten to update the code in xm-test for the new (xenbus_path, number) tuple that blkdev_name_to_number returns. While grepping through the tree, I also found two other places where I failed to fix up blkdev_name_to_number; all 3 of these fixes are in the attached patch. Signed-off-by: Chris Lalancette --------------080207090307090800080202 Content-Type: text/x-patch; name="xen-unstable-greater-16-vbd-tools-python-update.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="xen-unstable-greater-16-vbd-tools-python-update.patch" diff -r 0972fc23b504 tools/python/xen/util/blkif.py --- a/tools/python/xen/util/blkif.py Sat Jun 28 16:29:00 2008 +0100 +++ b/tools/python/xen/util/blkif.py Mon Jun 30 08:40:08 2008 +0200 @@ -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 0972fc23b504 tools/python/xen/xend/XendConfig.py --- a/tools/python/xen/xend/XendConfig.py Sat Jun 28 16:29:00 2008 +0100 +++ b/tools/python/xen/xend/XendConfig.py Mon Jun 30 08:40:08 2008 +0200 @@ -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 0972fc23b504 tools/xm-test/lib/XmTestLib/block_utils.py --- a/tools/xm-test/lib/XmTestLib/block_utils.py Sat Jun 28 16:29:00 2008 +0100 +++ b/tools/xm-test/lib/XmTestLib/block_utils.py Mon Jun 30 08:40:08 2008 +0200 @@ -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: --------------080207090307090800080202 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------080207090307090800080202--