KVM: rename TDX disable ept case and add disable tdx test case

tdx_disable.ept tdx_disable.tdx Signed-off-by: Xudong Hao <[email protected]>
intel · Dec 9, 2024 · 3667ec2 · 3667ec2
1 parent 1f835a6
commit 3667ec2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/KVM/qemu/td_disable_ept.cfg → KVM/qemu/tdx_disable.cfg b/KVM/qemu/td_disable_ept.cfg → KVM/qemu/tdx_disable.cfg
@@ -1,6 +1,6 @@
-- td_disable_ept:
+- tdx_disable:
     virt_test_type = qemu
-    type = td_disable_ept
+    type = tdx_disable
     vm_accelerator = kvm
     machine_type_extra_params = "kernel-irqchip=split"
     vm_secure_guest_type = tdx
@@ -11,7 +11,11 @@
     xfail = "yes"
     expected_status = 'N'
     default_status = 'Y'
-    parameter_name = 'ept'
+    variants:
+        - ept:
+            parameter_name = 'ept'
+        - tdx:
+            parameter_name = 'tdx'
     pre_command = 'modprobe -r kvm_intel && modprobe kvm_intel ${parameter_name}=${expected_status}'
     post_command = 'modprobe -r kvm_intel && modprobe kvm_intel ${parameter_name}=${default_status}'
     check_status_cmd = 'cat /sys/module/kvm_intel/parameters/${parameter_name}'
diff --git a/KVM/qemu/tests/td_disable_ept.py → KVM/qemu/tests/tdx_disable.py b/KVM/qemu/tests/td_disable_ept.py → KVM/qemu/tests/tdx_disable.py
@@ -13,8 +13,8 @@
 
 def run(test, params, env):
     """
-    Boot TD after disable ept:
-    1) Disable ept
+    Boot TD after disable ept or tdx:
+    1) Disable ept or tdx
     2) Boot up TDVM
     3) TDVM can not be lanuch as expect