Allow virt_mode other than pv.

QubesOS · Jul 29, 2020 · e8ba117 · e8ba117
1 parent eda68cc
commit e8ba117
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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 = ''