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

qubesvm: do not try to define libvirt object in offline mode

Browse Source 
The idea is to not touch libvirt at all.
This commit is contained in:
Marek Marczykowski-Górecki 2018-01-17 15:23:39 +01:00
parent f2b9be3607
commit dce3b609b4
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qubes/app.py
View File

@ -483,6 +483,7 @@ class VMCollection(object):
raise qubes.exc.QubesVMNotHaltedError(vm) raise qubes.exc.QubesVMNotHaltedError(vm)
self.app.fire_event('domain-pre-delete', pre_event=True, vm=vm) self.app.fire_event('domain-pre-delete', pre_event=True, vm=vm)
try: try:
if vm.libvirt_domain:
vm.libvirt_domain.undefine() vm.libvirt_domain.undefine()
# pylint: disable=protected-access # pylint: disable=protected-access
vm._libvirt_domain = None vm._libvirt_domain = None

3
qubes/vm/qubesvm.py
View File

@ -570,6 +570,9 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
if self._libvirt_domain is not None: if self._libvirt_domain is not None:
return self._libvirt_domain return self._libvirt_domain
if self.app.vmm.offline_mode:
return None
# XXX _update_libvirt_domain? # XXX _update_libvirt_domain?
try: try:
self._libvirt_domain = self.app.vmm.libvirt_conn.lookupByUUID( self._libvirt_domain = self.app.vmm.libvirt_conn.lookupByUUID(