From ec69355beffe138c0f97306e65410e5dbc605554 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Tue, 6 Jun 2017 18:12:24 +0200 Subject: target/ppc: pass const string to kvmppc_is_mem_backend_page_size_ok() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This function has three implementations. Two are stubs that do nothing and the third one only passes the obj_path argument to: Object *object_resolve_path(const char *path, bool *ambiguous); Signed-off-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Signed-off-by: David Gibson --- target/ppc/kvm.c | 4 ++-- target/ppc/kvm_ppc.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target') diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 51249ce79e..8881762076 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -478,7 +478,7 @@ static void kvm_fixup_page_sizes(PowerPCCPU *cpu) } } -bool kvmppc_is_mem_backend_page_size_ok(char *obj_path) +bool kvmppc_is_mem_backend_page_size_ok(const char *obj_path) { Object *mem_obj = object_resolve_path(obj_path, NULL); char *mempath = object_property_get_str(mem_obj, "mem-path", NULL); @@ -499,7 +499,7 @@ static inline void kvm_fixup_page_sizes(PowerPCCPU *cpu) { } -bool kvmppc_is_mem_backend_page_size_ok(char *obj_path) +bool kvmppc_is_mem_backend_page_size_ok(const char *obj_path) { return true; } diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index f48243d13f..eab7c8fdb3 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -64,7 +64,7 @@ int kvmppc_enable_hwrng(void); int kvmppc_put_books_sregs(PowerPCCPU *cpu); PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void); -bool kvmppc_is_mem_backend_page_size_ok(char *obj_path); +bool kvmppc_is_mem_backend_page_size_ok(const char *obj_path); #else @@ -211,7 +211,7 @@ static inline uint64_t kvmppc_rma_size(uint64_t current_size, return ram_size; } -static inline bool kvmppc_is_mem_backend_page_size_ok(char *obj_path) +static inline bool kvmppc_is_mem_backend_page_size_ok(const char *obj_path) { return true; } -- cgit v1.2.3 From 2d3e302ec2246d703ffa8d8f8769a3fa448d8145 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Tue, 6 Jun 2017 17:22:53 +0200 Subject: target/ppc: fix memory leak in kvmppc_is_mem_backend_page_size_ok() The string returned by object_property_get_str() is dynamically allocated. Signed-off-by: Greg Kurz Reviewed-by: Thomas Huth Signed-off-by: David Gibson --- target/ppc/kvm.c | 1 + 1 file changed, 1 insertion(+) (limited to 'target') diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 8881762076..f2f7c531bc 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -486,6 +486,7 @@ bool kvmppc_is_mem_backend_page_size_ok(const char *obj_path) if (mempath) { pagesize = qemu_mempath_getpagesize(mempath); + g_free(mempath); } else { pagesize = getpagesize(); } -- cgit v1.2.3