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

Revert "libvirt xen: Add gfx_passthru and device_video"

Browse Source 
Libxl now automatically enables the gfx_passthru when IGD is attached.

This reverts commit 3e8f5a7a57.
This commit is contained in:
Marek Marczykowski-Górecki 2020-06-10 15:40:28 +02:00
parent dc1b3b4d86
commit 4f04a1db91
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qubes/tests/vm/qubesvm.py
View File

@ -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> <cmdline>root=/dev/mapper/dmroot ro nomodeset console=hvc0 rd_NO_PLYMOUTH rd.plymouth.enable=0 plymouth.enable=0 nopat</cmdline>
</os> </os>
<features> <features>
<xen>
</xen>
</features> </features>
<clock offset='utc' adjustment='reset'> <clock offset='utc' adjustment='reset'>
<timer name="tsc" mode="native"/> <timer name="tsc" mode="native"/>
@ -853,8 +851,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<acpi/> <acpi/>
<apic/> <apic/>
<viridian/> <viridian/>
<xen>
</xen>
</features> </features>
<clock offset="variable" adjustment="0" basis="localtime" /> <clock offset="variable" adjustment="0" basis="localtime" />
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
@ -913,8 +909,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<acpi/> <acpi/>
<apic/> <apic/>
<viridian/> <viridian/>
<xen>
</xen>
</features> </features>
<clock offset="variable" adjustment="0" basis="localtime" /> <clock offset="variable" adjustment="0" basis="localtime" />
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
@ -982,8 +976,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<acpi/> <acpi/>
<apic/> <apic/>
<viridian/> <viridian/>
<xen>
</xen>
</features> </features>
<clock offset="variable" adjustment="0" basis="localtime" /> <clock offset="variable" adjustment="0" basis="localtime" />
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
@ -1048,8 +1040,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<acpi/> <acpi/>
<apic/> <apic/>
<viridian/> <viridian/>
<xen>
</xen>
</features> </features>
<clock offset='utc' adjustment='reset'> <clock offset='utc' adjustment='reset'>
<timer name="tsc" mode="native"/> <timer name="tsc" mode="native"/>
@ -1120,8 +1110,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<acpi/> <acpi/>
<apic/> <apic/>
<viridian/> <viridian/>
<xen>
</xen>
</features> </features>
<clock offset='utc' adjustment='reset'> <clock offset='utc' adjustment='reset'>
<timer name="tsc" mode="native"/> <timer name="tsc" mode="native"/>
@ -1279,8 +1267,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<acpi/> <acpi/>
<apic/> <apic/>
<viridian/> <viridian/>
<xen>
</xen>
</features> </features>
<clock offset="variable" adjustment="0" basis="localtime" /> <clock offset="variable" adjustment="0" basis="localtime" />
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
@ -1363,8 +1349,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<acpi/> <acpi/>
<apic/> <apic/>
<viridian/> <viridian/>
<xen>
</xen>
</features> </features>
<clock offset="variable" adjustment="0" basis="localtime" /> <clock offset="variable" adjustment="0" basis="localtime" />
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
@ -1466,8 +1450,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<acpi/> <acpi/>
<apic/> <apic/>
<viridian/> <viridian/>
<xen>
</xen>
</features> </features>
<clock offset="variable" adjustment="0" basis="localtime" /> <clock offset="variable" adjustment="0" basis="localtime" />
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
@ -1542,8 +1524,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<acpi/> <acpi/>
<apic/> <apic/>
<viridian/> <viridian/>
<xen>
</xen>
</features> </features>
<clock offset="variable" adjustment="0" basis="localtime" /> <clock offset="variable" adjustment="0" basis="localtime" />
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>

24
templates/libvirt/xen.xml
View File

@ -64,15 +64,13 @@
<apic/> <apic/>
<viridian/> <viridian/>
{% endif %} {% endif %}
{% if vm.devices['pci'].persistent() | list
and vm.features.get('pci-e820-host', True) %}
<xen> <xen>
{% if vm.devices['pci'].persistent() | list
and vm.features.get('pci-e820-host', True) %}
<e820_host state="on"/> <e820_host state="on"/>
{% endif %}
{% if vm.features.check_with_template('gfx-passthru', False) %}
<gfx_passthru state="on"/>
{% endif %}
</xen> </xen>
{% endif %}
{% endblock %} {% endblock %}
</features> </features>
@ -191,14 +189,12 @@
{% endif %} {% endif %}
/> />
<input type="tablet" bus="usb"/> <input type="tablet" bus="usb"/>
{% if vm.features.check_with_template('video-model', 'vga') != 'none' %} <video>
<video> <model type="{{ vm.features.check_with_template('video-model', 'vga') }}"/>
<model type="{{ vm.features.check_with_template('video-model', 'vga') }}"/> </video>
</video> {% if vm.features.check_with_template('linux-stubdom', True) %}
{% if vm.features.check_with_template('linux-stubdom', True) %} {# TODO only add qubes gui if gui-agent is not installed in HVM #}
{# TODO only add qubes gui if gui-agent is not installed in HVM #} <graphics type="qubes"/>
<graphics type="qubes"/>
{% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
<console type="pty"> <console type="pty">