Xen devel - Nov 2010 - [PATCH, v2] fix "xm block-detach 0 ..." for extended-ID devices

Simply taking stat()''s st_rdev doesn''t work here, as the minor
is
split into two parts, the major is present, and the "extended" bit
isn''t set.

Rather than fixing this in a way that would likely be OS-dependent,
simply remove the access to the device file, and instead just parse
the provided string (as is done e.g. for block-attach).

Signed-off-by: Jan Beulich <jbeulich@novell.com>

--- a/tools/python/xen/util/blkif.py
+++ b/tools/python/xen/util/blkif.py
@@ -19,11 +19,6 @@ def blkdev_name_to_number(name):
     devname = ''virtual-device''
     devnum = None
 
-    try:
-        return (devname, os.stat(n).st_rdev)
-    except Exception, ex:
-        pass
-
     scsi_major = [ 8, 65, 66, 67, 68, 69, 70, 71, 128, 129, 130, 131, 132, 133,
134, 135 ]
     if re.match( ''/dev/sd[a-z]([1-9]|1[0-5])?$'', n):
         major = scsi_major[(ord(n[7:8]) - ord(''a'')) / 16]





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

Jan Beulich wrote:
> Simply taking stat()''s st_rdev doesn''t work here, as the
minor is
> split into two parts, the major is present, and the "extended"
bit
> isn''t set.
>
> Rather than fixing this in a way that would likely be OS-dependent,
> simply remove the access to the device file, and instead just parse
> the provided string (as is done e.g. for block-attach).
>
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
>
> --- a/tools/python/xen/util/blkif.py
> +++ b/tools/python/xen/util/blkif.py
> @@ -19,11 +19,6 @@ def blkdev_name_to_number(name):
>      devname = ''virtual-device''
>      devnum = None
>  
> -    try:
> -        return (devname, os.stat(n).st_rdev)
> -    except Exception, ex:
> -        pass
> -
>      scsi_major = [ 8, 65, 66, 67, 68, 69, 70, 71, 128, 129, 130, 131, 132,
133, 134, 135 ]
>      if re.match( ''/dev/sd[a-z]([1-9]|1[0-5])?$'', n):
>          major = scsi_major[(ord(n[7:8]) - ord(''a'')) /
16]
>   
I just realized this is a hunk in one of our local patches :-(.

Acked-by: Jim Fehlig <jfehlig@novell.com>


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

Jan Beulich writes ("[PATCH, v2] fix "xm block-detach 0 ..." for 
extended-ID	 devices"):
> Simply taking stat()''s st_rdev doesn''t work here, as the
minor is
> split into two parts, the major is present, and the "extended"
bit
> isn''t set.
> 
> Rather than fixing this in a way that would likely be OS-dependent,
> simply remove the access to the device file, and instead just parse
> the provided string (as is done e.g. for block-attach).
> 
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
Applied, thanks.

Ian.

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