[Xen-devel] [PATCH] tools/python: fix TypeError for 17903:0728459b3c8d

["KUWAMURA Shin'ya" <kuwa@xxxxxxxxxxxxxx>]

Hi,

If `hda' is used in a domain config file and domain-0 has /dev/hda,
creating the domain failed by TypeError:

  File "//usr/lib/python/xen/xend/server/blkif.py", line 84, in
getDeviceDetails
    (device_path, devid) = blkif.blkdev_name_to_number(dev)
TypeError: unpack non-sequence

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
-- 
  KUWAMURA Shin'ya

# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
# Date 1214810013 -32400
# Node ID 0063343e6fcb2d9501e2410cd7dff8981a301f26
# Parent  0972fc23b5041c8a29416b2875ae7d45faa66109
tools/python: fix TypeError for 17903:0728459b3c8d

If `hda' is used in domU config file and domain-0 has /dev/hda,
creating a domain failed by TypeError:

  File "//usr/lib/python/xen/xend/server/blkif.py", line 84, in
getDeviceDetails
    (device_path, devid) = blkif.blkdev_name_to_number(dev)
TypeError: unpack non-sequence

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>

diff -r 0972fc23b504 -r 0063343e6fcb 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 16:13:33 2008 +0900
@@ -20,7 +20,7 @@ def blkdev_name_to_number(name):
     devnum = None
 
     try:
-        return os.stat(n).st_rdev
+        return (devname, os.stat(n).st_rdev)
     except Exception, ex:
         pass
 

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