Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dom0/qvm-block: add support for d0p1 style names, especially mmcblk* (#489)

Browse Source
This commit is contained in:
Marek Marczykowski 2012-03-15 10:58:57 +01:00
parent 1ebe503af8
commit 2eec6aaa7c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom0/qvm-core/qubesutils.py
View File

@ -119,16 +119,23 @@ def block_name_to_majorminor(name):
major = 0 major = 0
minor = 0 minor = 0
dXpY_style = False
name_match = re.match(r"([a-z]+)([a-z])([0-9]*)", name) name_match = re.match(r"([a-z]+)([a-z])([0-9]*)", name)
if not name_match: if not name_match:
raise QubesException("Invalid device name: %s" % name) name_match = re.match(r"([a-z]+)([0-9]*)(?:p([0-9]+)?", name)
if not name_match:
raise QubesException("Invalid device name: %s" % name)
else:
dXpY_style = True
disk = True disk = True
if name_match.group(1) == "xvd": if name_match.group(1) == "xvd":
major = 202 major = 202
elif name_match.group(1) == "sd": elif name_match.group(1) == "sd":
major = 8 major = 8
elif name_match.group(1) == "mmcblk":
major = 179
elif name.startswith("scd"): elif name.startswith("scd"):
disk = False disk = False
major = 11 major = 11
@ -143,7 +150,10 @@ def block_name_to_majorminor(name):
return (0, 0) return (0, 0)
if disk: if disk:
minor = (ord(name_match.group(2))-ord('a')) * 16 if dXpY_style:
minor = int(name_match.group(2))*8
else:
minor = (ord(name_match.group(2))-ord('a')) * 16
else: else:
minor = 0 minor = 0
if name_match.group(3): if name_match.group(3):