Merge pull request #3928 from zhencliu/cvm_options

Added vm_secure_guest_object_options for secure guest object

virttest/qemu_devices/qcontainer.py

@@ -3998,6 +3998,10 @@ def _gen_tdx_obj_props(obj_id, params):
                 raise ValueError("Unsupported tdx-guest object")
 
             backend, tdx_obj_props = "tdx-guest", {"id": obj_id}
+            tdx_opts = params.get_dict("vm_secure_guest_object_options")
+            if tdx_opts:
+                tdx_obj_props.update(tdx_opts)
+
             return backend, tdx_obj_props
 
         obj_props_handlers = {"sev": _gen_sev_obj_props, "tdx": _gen_tdx_obj_props}

virttest/shared/cfg/base.cfg

@@ -1096,6 +1096,10 @@ uuid_dimm = ""
 # Note: The following types are supported: sev
 #       Disable secure guest: vm_secure_guest_type[_vm1] = ""
 #
+# Set the secure guest object options, use a blank to join more options (optional)
+# TODO: Currently this param is used for tdx guest object only
+#vm_secure_guest_object_options[_vm1] = "debug=on mrconfigid=xx mrowner=yy"
+#
 # AMD SEV secure guest params
 #
 # Set the cbitpos, or specify per-vm values (required)