Merge pull request avocado-framework#3899 from zhencliu/tdx

Added Intel TDX support
Yingshun · May 13, 2024 · 055c07f · 055c07f
2 parents fb4d362 + ef92a77
commit 055c07f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/virttest/qemu_devices/qcontainer.py b/virttest/qemu_devices/qcontainer.py
@@ -1390,8 +1390,12 @@ def machine_q35(machine_params):
                 ),
                 qdevices.QCPUBus(params.get("cpu_model"), [[""], [0]], "vcpu"),
             )
-            pflash_devices = pflash_handler("ovmf", machine_params)
-            devices.extend(pflash_devices)
+
+            # FIXME: Use -bios option to set firmware for a tdx vm
+            if params.get("vm_secure_guest_type") != "tdx":
+                pflash_devices = pflash_handler("ovmf", machine_params)
+                devices.extend(pflash_devices)
+
             devices.append(
                 qdevices.QMachine(params=machine_params, child_bus=bus, aobject="pci.0")
             )

diff --git a/virttest/qemu_vm.py b/virttest/qemu_vm.py
@@ -1694,7 +1694,7 @@ def add_secure_guest_descriptor(params):
 
             sectype = params["vm_secure_guest_type"]
             sev_mach_props = {}
-            tdx_mach_props = {"kvm-type": "tdx"}
+            tdx_mach_props = {}
             backend_props = {"sev": sev_mach_props, "tdx": tdx_mach_props}
             for k, v in backend_props.get(sectype, {}).items():
                 machine_dev.set_param(k, v)