KVM: Add 4 UMIP test cases for TD and Non-TD VM

1 CPUID test 2 CPU flags tests 1 functionality test Signed-off-by: Xudong Hao <[email protected]>
intel · Sep 12, 2024 · 21ab1ab · 21ab1ab
1 parent 0f34266
commit 21ab1ab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/KVM/qemu/feature_test.cfg b/KVM/qemu/feature_test.cfg
@@ -10,6 +10,8 @@
     variants:
         - cmpccxadd:
             feature_dir_names = "cmpccxadd"
+        - umip:
+            feature_dir_names = "umip"
     variants:
         - vm:
         - tdvm:

diff --git a/KVM/qemu/x86_cpu_flags.cfg b/KVM/qemu/x86_cpu_flags.cfg
@@ -4,16 +4,23 @@
     start_vm = no
     check_host_flags = yes
     only i386, x86_64
+    auto_cpu_model = "no"
+    cpu_model = host
     variants:
         - tsc_deadline:
-            auto_cpu_model = "no"
-            cpu_model = host
             flags = "tsc_deadline_timer"
             variants:
                 - default:
                 - disable:
                     cpu_model_flags = ",-tsc-deadline"
                     no_flags = "tsc_deadline_timer"
+        - umip:
+            flags = "umip"
+            variants:
+                - default:
+                - disable:
+                    cpu_model_flags = ",-umip"
+                    no_flags = "umip"
     variants:
         - vm:
             # Only No-TDVM supports soft reboot

diff --git a/KVM/qemu/x86_cpuid.cfg b/KVM/qemu/x86_cpuid.cfg
@@ -38,6 +38,8 @@
             features = "AVX_NE_CONVERT"
         - cmpccxadd:
             features = "CMPCCXADD"
+        - umip:
+            features = "UMIP"
     variants:
         - vm:
         - tdvm: