Skip to content

Commit

Permalink
target/ppc: pass const string to kvmppc_is_mem_backend_page_size_ok()
Browse files Browse the repository at this point in the history
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 <groug@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
(cherry picked from commit ec69355)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
  • Loading branch information
gkurz authored and mdroth committed Aug 24, 2017
1 parent 2401d8a commit 917a5b9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions target/ppc/kvm.c
Expand Up @@ -415,7 +415,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);
Expand All @@ -436,7 +436,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;
}
Expand Down
4 changes: 2 additions & 2 deletions target/ppc/kvm_ppc.h
Expand Up @@ -57,7 +57,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

Expand Down Expand Up @@ -191,7 +191,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;
}
Expand Down

0 comments on commit 917a5b9

Please sign in to comment.