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

Merge remote-tracking branch 'qubesos/pr/197'

Browse Source 
* qubesos/pr/197:
  Don't fire domain-stopped/-shutdown while VM is still Dying
This commit is contained in:
Marek Marczykowski-Górecki 2018-02-22 21:14:55 +01:00
commit 716114f676
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubes/vm/qubesvm.py
View File

@ -975,6 +975,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
# an exception gets thrown. # an exception gets thrown.
self._domain_stopped_event_handled = True self._domain_stopped_event_handled = True
while self.get_power_state() == 'Dying':
yield from asyncio.sleep(0.25)
yield from self.fire_event_async('domain-stopped') yield from self.fire_event_async('domain-stopped')
yield from self.fire_event_async('domain-shutdown') yield from self.fire_event_async('domain-shutdown')
@ -1458,7 +1460,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
``'Paused'`` Machine is paused. ``'Paused'`` Machine is paused.
``'Suspended'`` Machine is S3-suspended. ``'Suspended'`` Machine is S3-suspended.
``'Halting'`` Machine is in process of shutting down. ``'Halting'`` Machine is in process of shutting down.
``'Dying'`` Machine crashed and is unusable. ``'Dying'`` Machine is still in process of shutting down.
``'Crashed'`` Machine crashed and is unusable, probably because of ``'Crashed'`` Machine crashed and is unusable, probably because of
bug in dom0. bug in dom0.
``'NA'`` Machine is in unknown state (most likely libvirt domain ``'NA'`` Machine is in unknown state (most likely libvirt domain