From a88b60dccced1143843e3918f4618ab656f6c0e5 Mon Sep 17 00:00:00 2001
From: Xudong Hao <xudong.hao@intel.com>
Date: Tue, 3 Sep 2024 09:53:36 +0800
Subject: [PATCH] KVM: update some test cases name

So that all TD cases can be run with simple description.
For example: x86_cpu_flags.tdvm

Signed-off-by: Xudong Hao <xudong.hao@intel.com>
---
 KVM/qemu/boot_check.cfg    | 14 +++++++-------
 KVM/qemu/x86_cpu_flags.cfg | 18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/KVM/qemu/boot_check.cfg b/KVM/qemu/boot_check.cfg
index 72c89bf7..4d593242 100644
--- a/KVM/qemu/boot_check.cfg
+++ b/KVM/qemu/boot_check.cfg
@@ -11,13 +11,6 @@
     kill_vm = yes
     shell_prompt = "^\[.*\][\#\$]\s*$"
     vga = std
-    variants:
-        - vm:
-        - tdvm:
-            machine_type_extra_params = "kernel-irqchip=split"
-            vm_secure_guest_type = tdx
-            auto_cpu_model = "no"
-            cpu_model = host
     variants:
         - 1_cpu:
             smp = 1
@@ -44,3 +37,10 @@
             mem = 4096
         - 16G:
             mem = 16384
+    variants:
+        - vm:
+        - tdvm:
+            machine_type_extra_params = "kernel-irqchip=split"
+            vm_secure_guest_type = tdx
+            auto_cpu_model = "no"
+            cpu_model = host
diff --git a/KVM/qemu/x86_cpu_flags.cfg b/KVM/qemu/x86_cpu_flags.cfg
index f5ec0fa1..a9ff90b4 100644
--- a/KVM/qemu/x86_cpu_flags.cfg
+++ b/KVM/qemu/x86_cpu_flags.cfg
@@ -4,15 +4,6 @@
     start_vm = no
     check_host_flags = yes
     only i386, x86_64
-    variants:
-        - vm:
-            # Only No-TDVM supports soft reboot
-            reboot_method = "shell"
-        - tdvm:
-            # TDVM doesn't support soft reboot
-            machine_type_extra_params = "kernel-irqchip=split"
-            vm_secure_guest_type = tdx
-            vga = std
     variants:
         - tsc_deadline:
             auto_cpu_model = "no"
@@ -23,3 +14,12 @@
                 - disable:
                     cpu_model_flags = ",-tsc-deadline"
                     no_flags = "tsc_deadline_timer"
+    variants:
+        - vm:
+            # Only No-TDVM supports soft reboot
+            reboot_method = "shell"
+        - tdvm:
+            # TDVM doesn't support soft reboot
+            machine_type_extra_params = "kernel-irqchip=split"
+            vm_secure_guest_type = tdx
+            vga = std