Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix suspend issues with 6.3 kernel in VMs #545

Merged
merged 1 commit into from Jul 4, 2023
Merged

Fix suspend issues with 6.3 kernel in VMs #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 0 additions & 20 deletions qubes/tests/vm/qubesvm.py
View file
Open in desktop
Expand Up @@ -830,8 +830,6 @@ def test_600_libvirt_xml_hvm(self):
<!-- disable nested HVM -->
<feature name='vmx' policy='disable'/>
<feature name='svm' policy='disable'/>
<!-- let the guest know the TSC is safe to use (no migration) -->
<feature name='invtsc' policy='require'/>
</cpu>
<os>
<type arch="x86_64" machine="xenfv">hvm</type>
Expand Down Expand Up @@ -887,8 +885,6 @@ def test_600_libvirt_xml_hvm_dom0_kernel(self):
<!-- disable nested HVM -->
<feature name='vmx' policy='disable'/>
<feature name='svm' policy='disable'/>
<!-- let the guest know the TSC is safe to use (no migration) -->
<feature name='invtsc' policy='require'/>
</cpu>
<os>
<type arch="x86_64" machine="xenfv">hvm</type>
Expand Down Expand Up @@ -954,8 +950,6 @@ def test_600_libvirt_xml_hvm_dom0_kernel_kernelopts(self):
<!-- disable nested HVM -->
<feature name='vmx' policy='disable'/>
<feature name='svm' policy='disable'/>
<!-- let the guest know the TSC is safe to use (no migration) -->
<feature name='invtsc' policy='require'/>
</cpu>
<os>
<type arch="x86_64" machine="xenfv">hvm</type>
Expand Down Expand Up @@ -1024,8 +1018,6 @@ def test_600_libvirt_xml_pvh(self):
<!-- disable nested HVM -->
<feature name='vmx' policy='disable'/>
<feature name='svm' policy='disable'/>
<!-- let the guest know the TSC is safe to use (no migration) -->
<feature name='invtsc' policy='require'/>
</cpu>
<os>
<type arch="x86_64" machine="xenpvh">xenpvh</type>
Expand Down Expand Up @@ -1094,8 +1086,6 @@ def test_600_libvirt_xml_pvh_no_membalance(self):
<!-- disable nested HVM -->
<feature name='vmx' policy='disable'/>
<feature name='svm' policy='disable'/>
<!-- let the guest know the TSC is safe to use (no migration) -->
<feature name='invtsc' policy='require'/>
</cpu>
<os>
<type arch="x86_64" machine="xenpvh">xenpvh</type>
Expand Down Expand Up @@ -1165,8 +1155,6 @@ def test_600_libvirt_xml_hvm_pcidev(self):
<!-- disable nested HVM -->
<feature name='vmx' policy='disable'/>
<feature name='svm' policy='disable'/>
<!-- let the guest know the TSC is safe to use (no migration) -->
<feature name='invtsc' policy='require'/>
</cpu>
<os>
<type arch="x86_64" machine="xenfv">hvm</type>
Expand Down Expand Up @@ -1246,8 +1234,6 @@ def test_600_libvirt_xml_hvm_cdrom_boot(self):
<!-- disable nested HVM -->
<feature name='vmx' policy='disable'/>
<feature name='svm' policy='disable'/>
<!-- let the guest know the TSC is safe to use (no migration) -->
<feature name='invtsc' policy='require'/>
</cpu>
<os>
<type arch="x86_64" machine="xenfv">hvm</type>
Expand Down Expand Up @@ -1327,8 +1313,6 @@ def test_600_libvirt_xml_hvm_cdrom_dom0_kernel_boot(self):
<!-- disable nested HVM -->
<feature name='vmx' policy='disable'/>
<feature name='svm' policy='disable'/>
<!-- let the guest know the TSC is safe to use (no migration) -->
<feature name='invtsc' policy='require'/>
</cpu>
<os>
<type arch="x86_64" machine="xenfv">hvm</type>
Expand Down Expand Up @@ -1429,8 +1413,6 @@ def test_610_libvirt_xml_network(self):
<!-- disable nested HVM -->
<feature name='vmx' policy='disable'/>
<feature name='svm' policy='disable'/>
<!-- let the guest know the TSC is safe to use (no migration) -->
<feature name='invtsc' policy='require'/>
</cpu>
<os>
<type arch="x86_64" machine="xenfv">hvm</type>
Expand Down Expand Up @@ -1503,8 +1485,6 @@ def test_615_libvirt_xml_block_devices(self):
<!-- disable nested HVM -->
<feature name='vmx' policy='disable'/>
<feature name='svm' policy='disable'/>
<!-- let the guest know the TSC is safe to use (no migration) -->
<feature name='invtsc' policy='require'/>
</cpu>
<os>
<type arch="x86_64" machine="xenfv">hvm</type>
Expand Down
2 changes: 0 additions & 2 deletions templates/libvirt/xen.xml
View file
Open in desktop
Expand Up @@ -20,8 +20,6 @@
{% if vm.app.host.cpu_family_model in [(6, 58), (6, 62)] -%}
<feature name='rdrand' policy='disable'/>
{% endif -%}
<!-- let the guest know the TSC is safe to use (no migration) -->
<feature name='invtsc' policy='require'/>
</cpu>
{% endif %}
{% endblock %}
Expand Down