Re: [PATCH v2 1/4] sysemu/kvm: Restrict kvmppc_get_radix_page_info() to ppc targets

[Daniel Henrique Barboza]

On 10/3/23 04:04, Philippe Mathieu-Daudé wrote:

kvm_get_radix_page_info() is only defined for ppc targets (in
target/ppc/kvm.c). The declaration is not useful in other targets,
reduce its scope.
Rename using the 'kvmppc_' prefix following other declarations
from target/ppc/kvm_ppc.h.

Suggested-by: Michael Tokarev 
Signed-off-by: Philippe Mathieu-Daudé 
---




Reviewed-by: Daniel Henrique Barboza 



  include/sysemu/kvm.h | 1 -
  target/ppc/kvm.c | 4 ++--
  2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index ee9025f8e9..3bcd8f45be 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -551,7 +551,6 @@ int kvm_set_one_reg(CPUState *cs, uint64_t id, void 
*source);
   * Returns: 0 on success, or a negative errno on failure.
   */
  int kvm_get_one_reg(CPUState *cs, uint64_t id, void *target);
-struct ppc_radix_page_info *kvm_get_radix_page_info(void);
  int kvm_get_max_memslots(void);
  
  /* Notify resamplefd for EOI of specific interrupts. */

diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 51112bd367..19fe6d2d00 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -268,7 +268,7 @@ static void kvm_get_smmu_info(struct kvm_ppc_smmu_info 
*info, Error **errp)
   "KVM failed to provide the MMU features it supports");
  }
  
-struct ppc_radix_page_info *kvm_get_radix_page_info(void)

+static struct ppc_radix_page_info *kvmppc_get_radix_page_info(void)
  {
  KVMState *s = KVM_STATE(current_accel());
  struct ppc_radix_page_info *radix_page_info;
@@ -2372,7 +2372,7 @@ static void kvmppc_host_cpu_class_init(ObjectClass *oc, 
void *data)
  }
  
  #if defined(TARGET_PPC64)

-pcc->radix_page_info = kvm_get_radix_page_info();
+pcc->radix_page_info = kvmppc_get_radix_page_info();
  
  if ((pcc->pvr & 0xff00) == CPU_POWERPC_POWER9_DD1) {

  /*

[PATCH v2 1/4] sysemu/kvm: Restrict kvmppc_get_radix_page_info() to ppc targets

[Philippe Mathieu-Daudé]

kvm_get_radix_page_info() is only defined for ppc targets (in
target/ppc/kvm.c). The declaration is not useful in other targets,
reduce its scope.
Rename using the 'kvmppc_' prefix following other declarations
from target/ppc/kvm_ppc.h.

Suggested-by: Michael Tokarev 
Signed-off-by: Philippe Mathieu-Daudé 
---
 include/sysemu/kvm.h | 1 -
 target/ppc/kvm.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index ee9025f8e9..3bcd8f45be 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -551,7 +551,6 @@ int kvm_set_one_reg(CPUState *cs, uint64_t id, void 
*source);
  * Returns: 0 on success, or a negative errno on failure.
  */
 int kvm_get_one_reg(CPUState *cs, uint64_t id, void *target);
-struct ppc_radix_page_info *kvm_get_radix_page_info(void);
 int kvm_get_max_memslots(void);
 
 /* Notify resamplefd for EOI of specific interrupts. */
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 51112bd367..19fe6d2d00 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -268,7 +268,7 @@ static void kvm_get_smmu_info(struct kvm_ppc_smmu_info 
*info, Error **errp)
  "KVM failed to provide the MMU features it supports");
 }
 
-struct ppc_radix_page_info *kvm_get_radix_page_info(void)
+static struct ppc_radix_page_info *kvmppc_get_radix_page_info(void)
 {
 KVMState *s = KVM_STATE(current_accel());
 struct ppc_radix_page_info *radix_page_info;
@@ -2372,7 +2372,7 @@ static void kvmppc_host_cpu_class_init(ObjectClass *oc, 
void *data)
 }
 
 #if defined(TARGET_PPC64)
-pcc->radix_page_info = kvm_get_radix_page_info();
+pcc->radix_page_info = kvmppc_get_radix_page_info();
 
 if ((pcc->pvr & 0xff00) == CPU_POWERPC_POWER9_DD1) {
 /*
-- 
2.41.0