drop old workaround kernelopts
- nopat - added when PAT in Linux+Xen was buggy, no longer the case for a long time. - iommu=soft swiotlb=8192 - necessary to limit required memory on PV with PCI devices; since we use HVM now (with proper IOMMU translation), this is no longer needed. Furthermore, it will free some memory in sys-* vms.
This commit is contained in:
parent
e4a8caaaa2
commit
8b4a4a72b4
@ -52,8 +52,8 @@ defaults = {
|
|||||||
'libvirt_uri': 'xen:///',
|
'libvirt_uri': 'xen:///',
|
||||||
'memory': 400,
|
'memory': 400,
|
||||||
'hvm_memory': 400,
|
'hvm_memory': 400,
|
||||||
'kernelopts': "nopat",
|
'kernelopts': "",
|
||||||
'kernelopts_pcidevs': "nopat iommu=soft swiotlb=8192",
|
'kernelopts_pcidevs': "",
|
||||||
'kernelopts_common': ('root=/dev/mapper/dmroot ro nomodeset console=hvc0 '
|
'kernelopts_common': ('root=/dev/mapper/dmroot ro nomodeset console=hvc0 '
|
||||||
'rd_NO_PLYMOUTH rd.plymouth.enable=0 plymouth.enable=0 '),
|
'rd_NO_PLYMOUTH rd.plymouth.enable=0 plymouth.enable=0 '),
|
||||||
|
|
||||||
|
@ -773,7 +773,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
|
|||||||
<type arch="x86_64" machine="xenpv">linux</type>
|
<type arch="x86_64" machine="xenpv">linux</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</cmdline>
|
||||||
</os>
|
</os>
|
||||||
<features>
|
<features>
|
||||||
</features>
|
</features>
|
||||||
@ -902,7 +902,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
|
|||||||
<loader type="rom">hvmloader</loader>
|
<loader type="rom">hvmloader</loader>
|
||||||
<boot dev="cdrom" />
|
<boot dev="cdrom" />
|
||||||
<boot dev="hd" />
|
<boot dev="hd" />
|
||||||
<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</cmdline>
|
||||||
</os>
|
</os>
|
||||||
<features>
|
<features>
|
||||||
<pae/>
|
<pae/>
|
||||||
@ -969,7 +969,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
|
|||||||
<loader type="rom">hvmloader</loader>
|
<loader type="rom">hvmloader</loader>
|
||||||
<boot dev="cdrom" />
|
<boot dev="cdrom" />
|
||||||
<boot dev="hd" />
|
<boot dev="hd" />
|
||||||
<cmdline>kernel specific options nopat</cmdline>
|
<cmdline>kernel specific options</cmdline>
|
||||||
</os>
|
</os>
|
||||||
<features>
|
<features>
|
||||||
<pae/>
|
<pae/>
|
||||||
@ -1033,7 +1033,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
|
|||||||
<type arch="x86_64" machine="xenpvh">xenpvh</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</cmdline>
|
||||||
</os>
|
</os>
|
||||||
<features>
|
<features>
|
||||||
<pae/>
|
<pae/>
|
||||||
@ -1103,7 +1103,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
|
|||||||
<type arch="x86_64" machine="xenpvh">xenpvh</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</cmdline>
|
||||||
</os>
|
</os>
|
||||||
<features>
|
<features>
|
||||||
<pae/>
|
<pae/>
|
||||||
@ -1342,7 +1342,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
|
|||||||
<loader type="rom">hvmloader</loader>
|
<loader type="rom">hvmloader</loader>
|
||||||
<boot dev="cdrom" />
|
<boot dev="cdrom" />
|
||||||
<boot dev="hd" />
|
<boot dev="hd" />
|
||||||
<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</cmdline>
|
||||||
</os>
|
</os>
|
||||||
<features>
|
<features>
|
||||||
<pae/>
|
<pae/>
|
||||||
|
Loading…
Reference in New Issue
Block a user