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

vm/qubesvm: have VM lifecycle related events async

Browse Source 
Those functions are coroutines anyway, so allow event handlers to be
too.
Some of this (`domain-create-on-disk`, `domain-remove-from-disk`) will
be useful for appmenus handling.
This commit is contained in:
Marek Marczykowski-Górecki 2017-06-26 01:56:07 +02:00
parent d00e4538bf
commit b5ad245614
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
qubes/vm/qubesvm.py
View File

@ -149,6 +149,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
Fired at the beginning of :py:meth:`start` method. Fired at the beginning of :py:meth:`start` method.
Handler for this event can be asynchronous (a coroutine).
:param subject: Event emitter (the qube object) :param subject: Event emitter (the qube object)
:param event: Event name (``'domain-pre-start'``) :param event: Event name (``'domain-pre-start'``)
@ -161,12 +163,16 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
:param subject: Event emitter (the qube object) :param subject: Event emitter (the qube object)
:param event: Event name (``'domain-spawn'``) :param event: Event name (``'domain-spawn'``)
Handler for this event can be asynchronous (a coroutine).
*other arguments are as in :py:meth:`start`* *other arguments are as in :py:meth:`start`*
.. event:: domain-start (subject, event, start_guid) .. event:: domain-start (subject, event, start_guid)
Fired at the end of :py:meth:`start` method. Fired at the end of :py:meth:`start` method.
Handler for this event can be asynchronous (a coroutine).
:param subject: Event emitter (the qube object) :param subject: Event emitter (the qube object)
:param event: Event name (``'domain-start'``) :param event: Event name (``'domain-start'``)
@ -183,6 +189,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
Fired at the beginning of :py:meth:`shutdown` method. Fired at the beginning of :py:meth:`shutdown` method.
Handler for this event can be asynchronous (a coroutine).
:param subject: Event emitter (the qube object) :param subject: Event emitter (the qube object)
:param event: Event name (``'domain-pre-shutdown'``) :param event: Event name (``'domain-pre-shutdown'``)
:param force: If the shutdown is to be forceful :param force: If the shutdown is to be forceful
@ -191,6 +199,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
Fired at the beginning of :py:meth:`run_service` method. Fired at the beginning of :py:meth:`run_service` method.
Handler for this event can be asynchronous (a coroutine).
:param subject: Event emitter (the qube object) :param subject: Event emitter (the qube object)
:param event: Event name (``'domain-cmd-pre-run'``) :param event: Event name (``'domain-cmd-pre-run'``)
:param start_guid: If the gui daemon can be started :param start_guid: If the gui daemon can be started
@ -199,6 +209,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
Fired at the end of :py:meth:`create_on_disk` method. Fired at the end of :py:meth:`create_on_disk` method.
Handler for this event can be asynchronous (a coroutine).
:param subject: Event emitter (the qube object) :param subject: Event emitter (the qube object)
:param event: Event name (``'domain-create-on-disk'``) :param event: Event name (``'domain-create-on-disk'``)
@ -207,6 +219,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
Fired at the beginning of :py:meth:`remove_from_disk` method, before Fired at the beginning of :py:meth:`remove_from_disk` method, before
the qube directory is removed. the qube directory is removed.
Handler for this event can be asynchronous (a coroutine).
:param subject: Event emitter (the qube object) :param subject: Event emitter (the qube object)
:param event: Event name (``'domain-remove-from-disk'``) :param event: Event name (``'domain-remove-from-disk'``)
@ -214,6 +228,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
Fired at the end of :py:meth:`clone_disk_files` method. Fired at the end of :py:meth:`clone_disk_files` method.
Handler for this event can be asynchronous (a coroutine).
:param subject: Event emitter (the qube object) :param subject: Event emitter (the qube object)
:param event: Event name (``'domain-clone-files'``) :param event: Event name (``'domain-clone-files'``)
:param src: source qube :param src: source qube
@ -847,7 +863,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
self.log.info('Starting {}'.format(self.name)) self.log.info('Starting {}'.format(self.name))
self.fire_event('domain-pre-start', yield from self.fire_event_async('domain-pre-start',
pre_event=True, pre_event=True,
start_guid=start_guid, mem_required=mem_required) start_guid=start_guid, mem_required=mem_required)
@ -874,7 +890,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
qmemman_client.close() qmemman_client.close()
try: try:
self.fire_event('domain-spawn', yield from self.fire_event_async('domain-spawn',
start_guid=start_guid) start_guid=start_guid)
self.log.info('Setting Qubes DB info for the VM') self.log.info('Setting Qubes DB info for the VM')
@ -895,7 +911,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
yield from self.start_qrexec_daemon() yield from self.start_qrexec_daemon()
self.fire_event('domain-start', start_guid=start_guid) yield from self.fire_event_async('domain-start',
start_guid=start_guid)
except: # pylint: disable=bare-except except: # pylint: disable=bare-except
if self.is_running() or self.is_paused(): if self.is_running() or self.is_paused():
@ -936,7 +953,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
if self.is_halted(): if self.is_halted():
raise qubes.exc.QubesVMNotStartedError(self) raise qubes.exc.QubesVMNotStartedError(self)
self.fire_event('domain-pre-shutdown', pre_event=True, force=force) yield from self.fire_event_async('domain-pre-shutdown', pre_event=True,
force=force)
self.libvirt_domain.shutdown() self.libvirt_domain.shutdown()
@ -1072,7 +1090,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
raise qubes.exc.QubesVMError( raise qubes.exc.QubesVMError(
self, 'Domain {!r}: qrexec not connected'.format(self.name)) self, 'Domain {!r}: qrexec not connected'.format(self.name))
self.fire_event('domain-cmd-pre-run', pre_event=True, start_guid=gui) yield from self.fire_event_async('domain-cmd-pre-run', pre_event=True,
start_guid=gui)
return (yield from asyncio.create_subprocess_exec( return (yield from asyncio.create_subprocess_exec(
qubes.config.system_path['qrexec_client_path'], qubes.config.system_path['qrexec_client_path'],
@ -1299,7 +1318,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
shutil.copy(self.label.icon_path, self.icon_path) shutil.copy(self.label.icon_path, self.icon_path)
# fire hooks # fire hooks
self.fire_event('domain-create-on-disk') yield from self.fire_event_async('domain-create-on-disk')
@asyncio.coroutine @asyncio.coroutine
def remove_from_disk(self): def remove_from_disk(self):
@ -1309,7 +1328,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
"Can't remove VM {!s}, beacuse it's in state {!r}.".format( "Can't remove VM {!s}, beacuse it's in state {!r}.".format(
self, self.get_power_state())) self, self.get_power_state()))
self.fire_event('domain-remove-from-disk') yield from self.fire_event_async('domain-remove-from-disk')
try: try:
# TODO: make it async? # TODO: make it async?
shutil.rmtree(self.dir_path) shutil.rmtree(self.dir_path)
@ -1367,7 +1386,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
shutil.copy(src.icon_path, self.icon_path) shutil.copy(src.icon_path, self.icon_path)
# fire hooks # fire hooks
self.fire_event('domain-clone-files', src=src) yield from self.fire_event_async('domain-clone-files', src=src)
# #
# methods for querying domain state # methods for querying domain state