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

block: fixes for dom0-backed devices and dead domains

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2015-04-14 23:07:54 +02:00
parent 936fa0f4cc
commit e1da1fb3c1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/qubesutils.py
View File

@ -334,6 +334,9 @@ def block_check_attached(qvmc, device):
raise QubesException("You need to pass qvmc argument") raise QubesException("You need to pass qvmc argument")
for vm in qvmc.values(): for vm in qvmc.values():
if vm.qid == 0:
# Connecting devices to dom0 not supported
continue
try: try:
libvirt_domain = vm.libvirt_domain libvirt_domain = vm.libvirt_domain
if libvirt_domain: if libvirt_domain:
@ -342,7 +345,7 @@ def block_check_attached(qvmc, device):
xml = None xml = None
except libvirt.libvirtError: except libvirt.libvirtError:
if vmm.libvirt_conn.virConnGetLastError()[0] == libvirt.VIR_ERR_NO_DOMAIN: if vmm.libvirt_conn.virConnGetLastError()[0] == libvirt.VIR_ERR_NO_DOMAIN:
libvirt_domain = None xml = None
else: else:
raise raise
if xml: if xml:
@ -783,6 +786,9 @@ class QubesWatch(object):
if e.args[0] != 2: if e.args[0] != 2:
raise raise
time.sleep(0.5) time.sleep(0.5)
if name not in self._qdb:
# domain no longer active
return
else: else:
name = "dom0" name = "dom0"
self._qdb[name] = QubesDB(name) self._qdb[name] = QubesDB(name)