Re: [PATCH v2 09/19] target/riscv: make riscv_add_satp_mode_properties() public

[LIU Zhiwei]

On 2023/9/6 17:16, Daniel Henrique Barboza wrote:

This function is used for both accelerators. Make it public, and call it
from kvm_riscv_cpu_add_kvm_properties(). This will make it easier to
split KVM specific code for the KVM accelerator class in the next patch.

Signed-off-by: Daniel Henrique Barboza <dbarb...@ventanamicro.com>

Reviewed-by: LIU Zhiwei <zhiwei_...@linux.alibaba.com>

Zhiwei

---
  target/riscv/cpu.c | 5 ++---
  target/riscv/cpu.h | 1 +
  target/riscv/kvm.c | 1 +
  3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 0dc9b3201d..50be127f36 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -1115,7 +1115,7 @@ static void cpu_riscv_set_satp(Object *obj, Visitor *v, 
const char *name,
      satp_map->init |= 1 << satp;
  }

-static void riscv_add_satp_mode_properties(Object *obj)

+void riscv_add_satp_mode_properties(Object *obj)
  {
      RISCVCPU *cpu = RISCV_CPU(obj);

@@ -1589,12 +1589,11 @@ static void riscv_cpu_add_multiext_prop_array(Object *obj,

  static void riscv_cpu_add_user_properties(Object *obj)
  {
  #ifndef CONFIG_USER_ONLY
-    riscv_add_satp_mode_properties(obj);
-
      if (kvm_enabled()) {
          kvm_riscv_cpu_add_kvm_properties(obj);
          return;
      }
+    riscv_add_satp_mode_properties(obj);
  #endif

riscv_cpu_add_misa_properties(obj);

diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index b9c4bea3f7..950c2301f2 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -726,6 +726,7 @@ extern const RISCVCPUMultiExtConfig 
riscv_cpu_experimental_exts[];
  extern Property riscv_cpu_options[];

void riscv_cpu_add_misa_properties(Object *cpu_obj);

+void riscv_add_satp_mode_properties(Object *obj);

/* CSR function table */

  extern riscv_csr_operations csr_ops[CSR_TABLE_SIZE];
diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c
index 7dac01374f..ef6b2cfffe 100644
--- a/target/riscv/kvm.c
+++ b/target/riscv/kvm.c
@@ -1279,6 +1279,7 @@ void kvm_riscv_cpu_add_kvm_properties(Object *obj)
      DeviceState *dev = DEVICE(obj);

riscv_init_user_properties(obj);

+    riscv_add_satp_mode_properties(obj);
      riscv_cpu_add_misa_properties(obj);

riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_extensions);