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

dom0/qvm-core: release lock in VM.start() right before starting qrexec (#344)

Browse Source
This commit is contained in:
Marek Marczykowski 2011-10-10 11:07:30 +02:00
parent 57aec48050
commit e1ccda362c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1052,6 +1052,13 @@ class QubesVm(object):
print >> sys.stderr, "--> Starting the VM..." print >> sys.stderr, "--> Starting the VM..."
xc.domain_unpause(xid) xc.domain_unpause(xid)
# close() is not really needed, because the descriptor is close-on-exec
# anyway, the reason to postpone close() is that possibly xl is not done
# constructing the domain after its main process exits
# so we close() when we know the domain is up
# the successful unpause is some indicator of it
qmemman_client.close()
if not preparing_dvm: if not preparing_dvm:
if verbose: if verbose:
print >> sys.stderr, "--> Starting the qrexec daemon..." print >> sys.stderr, "--> Starting the qrexec daemon..."
@ -1060,13 +1067,6 @@ class QubesVm(object):
self.force_shutdown() self.force_shutdown()
raise OSError ("ERROR: Cannot execute qrexec_daemon!") raise OSError ("ERROR: Cannot execute qrexec_daemon!")
# close() is not really needed, because the descriptor is close-on-exec
# anyway, the reason to postpone close() is that possibly xl is not done
# constructing the domain after its main process exits
# so we close() when we know the domain is up
# the successful qrexec connect is a good indicator of it
qmemman_client.close()
if preparing_dvm: if preparing_dvm:
if verbose: if verbose:
print >> sys.stderr, "--> Preparing config template for DispVM" print >> sys.stderr, "--> Preparing config template for DispVM"