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

* qubesos/pr/11:
  libvirtError in _update_libvirt_domain is no longer silently swallowed.
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-25 03:46:55 +01:00
commit cc3ab7aaa1
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -737,6 +737,8 @@ class QubesVm(object):
raise QubesException("HVM domains not supported on this " raise QubesException("HVM domains not supported on this "
"machine. Check BIOS settings for " "machine. Check BIOS settings for "
"VT-x/AMD-V extensions.") "VT-x/AMD-V extensions.")
else:
raise e
self.uuid = uuid.UUID(bytes=self._libvirt_domain.UUID()) self.uuid = uuid.UUID(bytes=self._libvirt_domain.UUID())
@property @property