[virt-manager PATCH 1/2] tests: include CPU security features in kvm q35 domcapabilities

[Pavel Hrdina <phrdina@xxxxxxxxxx>]

Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
 tests/capabilities-xml/kvm-x86_64-domcaps-q35.xml           | 3 ++-
 tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/capabilities-xml/kvm-x86_64-domcaps-q35.xml b/tests/capabilities-xml/kvm-x86_64-domcaps-q35.xml
index 780ada61..b4300cfa 100644
--- a/tests/capabilities-xml/kvm-x86_64-domcaps-q35.xml
+++ b/tests/capabilities-xml/kvm-x86_64-domcaps-q35.xml
@@ -20,7 +20,7 @@
   <cpu>
     <mode name='host-passthrough' supported='yes'/>
     <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Skylake-Client</model>
+      <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>
       <feature policy='require' name='ss'/>
       <feature policy='require' name='vmx'/>
@@ -28,6 +28,7 @@
       <feature policy='require' name='tsc_adjust'/>
       <feature policy='require' name='clflushopt'/>
       <feature policy='require' name='xsaves'/>
+      <feature policy='require' name='ssbd'/>
       <feature policy='require' name='pdpe1gb'/>
       <feature policy='require' name='invtsc'/>
     </mode>
diff --git a/tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml b/tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml
index a86d6926..de73803b 100644
--- a/tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml
+++ b/tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml
@@ -14,6 +14,8 @@
   </features>
   <cpu mode="custom" match="exact">
     <model>qemu64</model>
+    <feature policy="require" name="spec-ctrl"/>
+    <feature policy="require" name="ssbd"/>
   </cpu>
   <clock offset="utc">
     <timer name="rtc" tickpolicy="catchup"/>
@@ -61,6 +63,8 @@
   </features>
   <cpu mode="custom" match="exact">
     <model>qemu64</model>
+    <feature policy="require" name="spec-ctrl"/>
+    <feature policy="require" name="ssbd"/>
   </cpu>
   <clock offset="utc">
     <timer name="rtc" tickpolicy="catchup"/>
-- 
2.21.0

_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list