From 4f04a1db9104f162ae61c94d27625fe131a4ff06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 10 Jun 2020 15:40:28 +0200
Subject: [PATCH] Revert "libvirt xen: Add gfx_passthru and device_video"

Libxl now automatically enables the gfx_passthru when IGD is attached.

This reverts commit 3e8f5a7a57e1be18710dd312ba46430ba9410a25.
---
 qubes/tests/vm/qubesvm.py | 20 --------------------
 templates/libvirt/xen.xml | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/qubes/tests/vm/qubesvm.py b/qubes/tests/vm/qubesvm.py
index 3d3c5234..dee06488 100644
--- a/qubes/tests/vm/qubesvm.py
+++ b/qubes/tests/vm/qubesvm.py
@@ -776,8 +776,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             <cmdline>root=/dev/mapper/dmroot ro nomodeset console=hvc0 rd_NO_PLYMOUTH rd.plymouth.enable=0 plymouth.enable=0 nopat</cmdline>
         </os>
         <features>
-            <xen>
-            </xen>
         </features>
         <clock offset='utc' adjustment='reset'>
             <timer name="tsc" mode="native"/>
@@ -853,8 +851,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             <acpi/>
             <apic/>
             <viridian/>
-            <xen>
-            </xen>
         </features>
         <clock offset="variable" adjustment="0" basis="localtime" />
         <on_poweroff>destroy</on_poweroff>
@@ -913,8 +909,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             <acpi/>
             <apic/>
             <viridian/>
-            <xen>
-            </xen>
         </features>
         <clock offset="variable" adjustment="0" basis="localtime" />
         <on_poweroff>destroy</on_poweroff>
@@ -982,8 +976,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             <acpi/>
             <apic/>
             <viridian/>
-            <xen>
-            </xen>
         </features>
         <clock offset="variable" adjustment="0" basis="localtime" />
         <on_poweroff>destroy</on_poweroff>
@@ -1048,8 +1040,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             <acpi/>
             <apic/>
             <viridian/>
-            <xen>
-            </xen>
         </features>
         <clock offset='utc' adjustment='reset'>
             <timer name="tsc" mode="native"/>
@@ -1120,8 +1110,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             <acpi/>
             <apic/>
             <viridian/>
-            <xen>
-            </xen>
         </features>
         <clock offset='utc' adjustment='reset'>
             <timer name="tsc" mode="native"/>
@@ -1279,8 +1267,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             <acpi/>
             <apic/>
             <viridian/>
-            <xen>
-            </xen>
         </features>
         <clock offset="variable" adjustment="0" basis="localtime" />
         <on_poweroff>destroy</on_poweroff>
@@ -1363,8 +1349,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             <acpi/>
             <apic/>
             <viridian/>
-            <xen>
-            </xen>
         </features>
         <clock offset="variable" adjustment="0" basis="localtime" />
         <on_poweroff>destroy</on_poweroff>
@@ -1466,8 +1450,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             <acpi/>
             <apic/>
             <viridian/>
-            <xen>
-            </xen>
         </features>
         <clock offset="variable" adjustment="0" basis="localtime" />
         <on_poweroff>destroy</on_poweroff>
@@ -1542,8 +1524,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             <acpi/>
             <apic/>
             <viridian/>
-            <xen>
-            </xen>
         </features>
         <clock offset="variable" adjustment="0" basis="localtime" />
         <on_poweroff>destroy</on_poweroff>
diff --git a/templates/libvirt/xen.xml b/templates/libvirt/xen.xml
index 055e109c..7d41facb 100644
--- a/templates/libvirt/xen.xml
+++ b/templates/libvirt/xen.xml
@@ -64,15 +64,13 @@
                 <apic/>
                 <viridian/>
             {% endif %}
+
+            {% if vm.devices['pci'].persistent() | list
+                    and vm.features.get('pci-e820-host', True) %}
                 <xen>
-                {% if vm.devices['pci'].persistent() | list
-                      and vm.features.get('pci-e820-host', True) %}
                     <e820_host state="on"/>
-                {% endif %}
-                {% if vm.features.check_with_template('gfx-passthru', False) %}
-                    <gfx_passthru state="on"/>
-                {% endif %}
                 </xen>
+            {% endif %}
         {% endblock %}
     </features>
 
@@ -191,14 +189,12 @@
                     {% endif %}
                     />
                 <input type="tablet" bus="usb"/>
-                {% if vm.features.check_with_template('video-model', 'vga') != 'none' %}
-                    <video>
-                        <model type="{{ vm.features.check_with_template('video-model', 'vga') }}"/>
-                    </video>
-                    {% if vm.features.check_with_template('linux-stubdom', True) %}
-                        {# TODO only add qubes gui if gui-agent is not installed in HVM #}
-                        <graphics type="qubes"/>
-                    {% endif %}
+                <video>
+                    <model type="{{ vm.features.check_with_template('video-model', 'vga') }}"/>
+                </video>
+                {% if vm.features.check_with_template('linux-stubdom', True) %}
+                    {# TODO only add qubes gui if gui-agent is not installed in HVM #}
+                    <graphics type="qubes"/>
                 {% endif %}
             {% endif %}
                 <console type="pty">