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

qubesvm: PVH minor improvements

Browse Source 
- use capital letters in acronyms in documentation to match upstream
documentation.
- refuse to start a PVH with without kernel set - provide meaningful
error message
This commit is contained in:
Marek Marczykowski-Górecki 2018-01-16 21:42:20 +01:00
parent 4d59f883a0
commit 7905783861
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qubes/vm/qubesvm.py
View File

@ -391,8 +391,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
virt_mode = qubes.property('virt_mode', virt_mode = qubes.property('virt_mode',
type=str, setter=_setter_virt_mode, type=str, setter=_setter_virt_mode,
default=_default_virt_mode, default=_default_virt_mode,
doc='''Virtualisation mode: full virtualisation ("hvm"), doc='''Virtualisation mode: full virtualisation ("HVM"),
or paravirtualisation ("pv"), or hybrid ("pvh")''') or paravirtualisation ("PV"), or hybrid ("PVH")''')
installed_by_rpm = qubes.property('installed_by_rpm', installed_by_rpm = qubes.property('installed_by_rpm',
type=bool, setter=qubes.property.bool, type=bool, setter=qubes.property.bool,
@ -869,6 +869,9 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
qmemman_client = None qmemman_client = None
try: try:
if self.virt_mode == 'pvh' and self.kernel is None:
raise qubes.exc.QubesException(
'virt_mode PVH require kernel to be set')
yield from self.storage.verify() yield from self.storage.verify()
if self.netvm is not None: if self.netvm is not None: