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

dom0/qvm-block: ignore unsupported devices istead of throw exception (#476)

Browse Source
This commit is contained in:
Marek Marczykowski 2012-03-09 00:00:20 +01:00
parent 35b1264424
commit c174d0c184
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,7 +136,8 @@ def block_name_to_majorminor(name):
disk = False disk = False
major = 11 major = 11
else: else:
raise QubesException("Unknown device type %s" % name_match.group(1)) # Unknown device
return (0, 0)
if disk: if disk:
minor = (ord(name_match.group(2))-ord('a')) * 16 minor = (ord(name_match.group(2))-ord('a')) * 16
@ -211,6 +212,10 @@ def block_list(vm = None):
if not mode_re.match(device_mode): if not mode_re.match(device_mode):
print >> sys.stderr, "Invalid %s device mode in VM '%s'" % (device, vm_name) print >> sys.stderr, "Invalid %s device mode in VM '%s'" % (device, vm_name)
continue continue
# Check if we know major number for this device; attach will work without this, but detach and check_attached don't
if block_name_to_majorminor(device) == (0, 0):
print >> sys.stderr, "Unsupported device %s:%s" % (vm_name, device)
continue
visible_name = "%s:%s" % (vm_name, device) visible_name = "%s:%s" % (vm_name, device)
devices_list[visible_name] = {"name": visible_name, "xid":int(xid), devices_list[visible_name] = {"name": visible_name, "xid":int(xid),
"vm": vm_name, "device":device, "size":int(device_size), "vm": vm_name, "device":device, "size":int(device_size),