dispvm: cleanup DispVM even if was already destroyed
dispvm.force_shutdown() throw an exception if the VM is already dead. Fixes QubesOS/qubes-issues#1660
This commit is contained in:
parent
176755d9e2
commit
689df4afd3
@ -182,7 +182,11 @@ def main():
|
||||
subprocess.call(['/usr/lib/qubes/qrexec-client', '-d', dispvm.name,
|
||||
user+':exec /usr/lib/qubes/qubes-rpc-multiplexer ' +
|
||||
exec_index + " " + src_vmname])
|
||||
dispvm.force_shutdown()
|
||||
try:
|
||||
dispvm.force_shutdown()
|
||||
except QubesException:
|
||||
# VM already destroyed
|
||||
pass
|
||||
qfile.remove_disposable_from_qdb(dispvm.name)
|
||||
|
||||
main()
|
||||
|
Loading…
Reference in New Issue
Block a user