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

Merge branch 'libvirt-template-r41'

Browse Source 
* libvirt-template-r41:
  libvirt: adjust domain xml template for upstream PVH format
This commit is contained in:
Marek Marczykowski-Górecki 2019-03-08 18:07:07 +01:00
commit c093e14077
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

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

2
templates/libvirt/xen.xml
View File

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