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

vm/qubesvm: remove duplicated qmemman_client.close()

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-09-22 22:47:09 +02:00
parent e38e227503
commit 8c847faacc
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes/vm/qubesvm.py
View File

@ -872,15 +872,6 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
self.log.warning('Activating the {} VM'.format(self.name)) self.log.warning('Activating the {} VM'.format(self.name))
self.libvirt_domain.resume() self.libvirt_domain.resume()
# 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
if qmemman_client:
qmemman_client.close()
qmemman_client = None
yield from self.start_qrexec_daemon() yield from self.start_qrexec_daemon()
yield from self.fire_event_async('domain-start', yield from self.fire_event_async('domain-start',
@ -893,9 +884,6 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
# running or paused # running or paused
yield from self.kill() # pylint: disable=not-an-iterable yield from self.kill() # pylint: disable=not-an-iterable
raise raise
finally:
if qmemman_client:
qmemman_client.close()
return self return self