From edd31dc98e89167490ecbfc708680b2f25e8b63d Mon Sep 17 00:00:00 2001
From: hanliyang <hanliyang@hygon.cn>
Date: Tue, 31 Dec 2024 13:33:20 +0800
Subject: [PATCH 1/4] i386: Avoid explicitly using
 KVM_CAP_HYGON_COCO_EXT_CSV3_SET_PRIV_MEM in hw/i386/pc_sysfw.c

Additionally, add 1 space to make the log format for the trace event
kvm_csv3_launch_encrypt_datas more user-friendly.

Fixes: 08495c0e6f ("target/i386: csv: Request to set private memory of CSV3 guest if the extension is enabled")
Signed-off-by: hanliyang <hanliyang@hygon.cn>
---
 hw/i386/pc_sysfw.c       | 2 +-
 include/sysemu/kvm.h     | 9 +++++++++
 target/i386/trace-events | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index ed00786f42..c18a0c6236 100644
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -210,7 +210,7 @@ static void pc_system_flash_map(PCMachineState *pcms,
                 }
 
                 if (csv_enabled()) {
-                    if (kvm_hygon_coco_ext_inuse & KVM_CAP_HYGON_COCO_EXT_CSV3_SET_PRIV_MEM)
+                    if (kvm_csv3_should_set_priv_mem())
                         csv3_set_guest_private_memory(&error_fatal);
 
                     csv_load_data(flash_mem->addr, flash_ptr, flash_size, &error_fatal);
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 9f8099f487..f050dfa1f7 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -168,6 +168,14 @@ extern bool kvm_has_msr_ghcb;
  */
 #define kvm_msi_devid_required() (kvm_msi_use_devid)
 
+/**
+ * kvm_csv3_should_set_priv_mem:
+ * Returns: true if we should explicitly request
+ *          KVM_CSV3_SET_GUEST_PRIVATE_MEMORY.
+ */
+#define kvm_csv3_should_set_priv_mem() \
+        (kvm_hygon_coco_ext_inuse & KVM_CAP_HYGON_COCO_EXT_CSV3_SET_PRIV_MEM)
+
 #else
 
 #define kvm_enabled()           (0)
@@ -185,6 +193,7 @@ extern bool kvm_has_msr_ghcb;
 #define kvm_direct_msi_enabled() (false)
 #define kvm_ioeventfd_any_length_enabled() (false)
 #define kvm_msi_devid_required() (false)
+#define kvm_csv3_should_set_priv_mem() (false)
 
 #endif  /* CONFIG_KVM_IS_POSSIBLE */
 
diff --git a/target/i386/trace-events b/target/i386/trace-events
index 0610d5ea8f..5d4a709a39 100644
--- a/target/i386/trace-events
+++ b/target/i386/trace-events
@@ -21,7 +21,7 @@ kvm_sev_send_update_vmsa(uint32_t cpu_id, uint32_t cpu_index, void *dst, int len
 kvm_sev_receive_update_vmsa(uint32_t cpu_id, uint32_t cpu_index, void *src, int len, void *hdr, int hdr_len) "cpu_id %d cpu_index %d trans %p len %d hdr %p hdr_len %d"
 
 # csv.c
-kvm_csv3_launch_encrypt_data(uint64_t gpa, void *addr, uint64_t len) "gpa 0x%" PRIx64 "addr %p len 0x%" PRIx64
+kvm_csv3_launch_encrypt_data(uint64_t gpa, void *addr, uint64_t len) "gpa 0x%" PRIx64 " addr %p len 0x%" PRIx64
 kvm_csv3_send_encrypt_data(void *dst, int len) "trans %p len %d"
 kvm_csv3_send_encrypt_context(void *dst, int len) "trans %p len %d"
 kvm_csv3_receive_encrypt_data(void *dst, int len, void *hdr, int hdr_len) "trans %p len %d hdr %p hdr_len %d"
-- 
2.39.3