ia64/xen-unstable

changeset 19275:7ee8bbac10d6

xend: blkif hda regexp fix
Signed-off-by: Michal Novotny <minovotn@redhat.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Mar 05 15:10:17 2009 +0000 (2009-03-05)
parents 29cc9eef7939
children cff29d694a89
files tools/python/xen/util/blkif.py
line diff
     1.1 --- a/tools/python/xen/util/blkif.py	Thu Mar 05 15:06:06 2009 +0000
     1.2 +++ b/tools/python/xen/util/blkif.py	Thu Mar 05 15:10:17 2009 +0000
     1.3 @@ -33,7 +33,7 @@ def blkdev_name_to_number(name):
     1.4          major = scsi_major[((ord(n[7:8]) - ord('a') + 1) * 26 + (ord(n[8:9]) - ord('a'))) / 16 ]
     1.5          minor = (((ord(n[7:8]) - ord('a') + 1 ) * 26 + (ord(n[8:9]) - ord('a'))) % 16) * 16 + int(n[9:] or 0)
     1.6          devnum = major * 256 + minor
     1.7 -    elif re.match( '/dev/hd[a-t]([1-9]|[1-5][0-9]|6[0-3])?', n):
     1.8 +    elif re.match( '/dev/hd[a-t]([1-9]|[1-5][0-9]|6[0-3])?$', n):
     1.9          ide_majors = [ 3, 22, 33, 34, 56, 57, 88, 89, 90, 91 ]
    1.10          major = ide_majors[(ord(n[7:8]) - ord('a')) / 2]
    1.11          minor = ((ord(n[7:8]) - ord('a')) % 2) * 64 + int(n[8:] or 0)