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

Merge remote-tracking branch 'origin/pr/341'

Browse Source 
* origin/pr/341:
  libvirt xen: Add gfx_passthru and device_video
This commit is contained in:
Marek Marczykowski-Górecki 2020-05-07 04:36:08 +02:00
commit 4a56064adb
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -751,6 +751,8 @@ 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"/>
@ -826,6 +828,8 @@ 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>
@ -884,6 +888,8 @@ 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>
@ -951,6 +957,8 @@ 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>
@ -1015,6 +1023,8 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<acpi/>
<apic/>
<viridian/>
<xen>
</xen>
</features>
<clock offset='utc' adjustment='reset'>
<timer name="tsc" mode="native"/>
@ -1085,6 +1095,8 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<acpi/>
<apic/>
<viridian/>
<xen>
</xen>
</features>
<clock offset='utc' adjustment='reset'>
<timer name="tsc" mode="native"/>
@ -1242,6 +1254,8 @@ 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>
@ -1324,6 +1338,8 @@ 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>
@ -1425,6 +1441,8 @@ 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>
@ -1499,6 +1517,8 @@ 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>

24
templates/libvirt/xen.xml
View File

@ -61,13 +61,15 @@
<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>
@ -186,12 +188,14 @@
{% endif %}
/>
<input type="tablet" bus="usb"/>
<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"/>
{% 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 %}
{% endif %}
{% endif %}
<console type="pty">