Allow virt_mode other than pv.

2020-06-30 12:14:50 +08:00 · 2020-06-30 12:14:50 +08:00 · e8ba117c26
commit e8ba117c26
parent eda68cce6d
1 changed files with 4 additions and 1 deletions
--- a/qubesadmin/tools/qvm_template_postprocess.py
+++ b/qubesadmin/tools/qvm_template_postprocess.py
@ -302,9 +302,12 @@ def post_install(args):
        if 'virt-mode' in conf:
            if conf['virt-mode'] == 'pv' and args.allow_pv:
                vm.virt_mode = 'pv'
-            else:
+            elif conf['virt-mode'] == 'pv':
                vm.log.warning(
                    '--allow-pv not set, ignoring request to change virt-mode')
+            elif conf['virt-mode'] in ('pvh', 'hvm'):
+                vm.virt_mode = conf['virt-mode']
+
        if 'kernel' in conf:
            if conf['kernel'] == '':
                vm.kernel = ''