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

libvirt: adjust domain xml template for upstream PVH format

Browse Source 
The final PVH support upstream use different machine type name.
This commit is contained in:
Marek Marczykowski-Górecki 2019-02-19 00:56:25 +01:00
parent 322306ec65
commit adcc9d7e77
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -882,7 +882,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<feature name='smap' policy='disable'/> <feature name='smap' policy='disable'/>
</cpu> </cpu>
<os> <os>
<type arch="x86_64" machine="xenfv">pvh</type> <type arch="x86_64" machine="xenpvh">xenpvh</type>
<kernel>/tmp/kernel/vmlinuz</kernel> <kernel>/tmp/kernel/vmlinuz</kernel>
<initrd>/tmp/kernel/initramfs</initrd> <initrd>/tmp/kernel/initramfs</initrd>
<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>
@ -952,7 +952,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<feature name='smap' policy='disable'/> <feature name='smap' policy='disable'/>
</cpu> </cpu>
<os> <os>
<type arch="x86_64" machine="xenfv">pvh</type> <type arch="x86_64" machine="xenpvh">xenpvh</type>
<kernel>/tmp/kernel/vmlinuz</kernel> <kernel>/tmp/kernel/vmlinuz</kernel>
<initrd>/tmp/kernel/initramfs</initrd> <initrd>/tmp/kernel/initramfs</initrd>
<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>

2
templates/libvirt/xen.xml
View File

@ -36,7 +36,7 @@
<boot dev="hd" /> <boot dev="hd" />
{% else %} {% else %}
{% if vm.virt_mode == 'pvh' %} {% if vm.virt_mode == 'pvh' %}
<type arch="x86_64" machine="xenfv">pvh</type> <type arch="x86_64" machine="xenpvh">xenpvh</type>
{% else %} {% else %}
<type arch="x86_64" machine="xenpv">linux</type> <type arch="x86_64" machine="xenpv">linux</type>
{% endif %} {% endif %}