diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-20 22:09:37 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-20 23:01:08 -0500 |
commit | 7267c0947d7e8ae5dff7bafd932c3bc285f43e5c (patch) | |
tree | 9aa05d6e05ed83e67bf014f6745a3081b8407dc5 /target-ppc | |
parent | 14015304b662e8f8ccce46c5a6927af6a14c510b (diff) | |
download | qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.zip qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.tar.gz qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.tar.bz2 |
Use glib memory allocation and free functions
qemu_malloc/qemu_free no longer exist after this commit.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-ppc')
-rw-r--r-- | target-ppc/helper.c | 4 | ||||
-rw-r--r-- | target-ppc/kvm_ppc.c | 2 | ||||
-rw-r--r-- | target-ppc/translate_init.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 789e6aa..3abab1a 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -3089,7 +3089,7 @@ CPUPPCState *cpu_ppc_init (const char *cpu_model) if (!def) return NULL; - env = qemu_mallocz(sizeof(CPUPPCState)); + env = g_malloc0(sizeof(CPUPPCState)); cpu_exec_init(env); if (tcg_enabled()) { ppc_translate_init(); @@ -3105,5 +3105,5 @@ CPUPPCState *cpu_ppc_init (const char *cpu_model) void cpu_ppc_close (CPUPPCState *env) { /* Should also remove all opcode tables... */ - qemu_free(env); + g_free(env); } diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c index 536fcab..867dc1d 100644 --- a/target-ppc/kvm_ppc.c +++ b/target-ppc/kvm_ppc.c @@ -32,7 +32,7 @@ int kvmppc_read_host_property(const char *node_path, const char *prop, pathlen = snprintf(NULL, 0, "%s/%s/%s", PROC_DEVTREE_PATH, node_path, prop) + 1; - path = qemu_malloc(pathlen); + path = g_malloc(pathlen); snprintf(path, pathlen, "%s/%s/%s", PROC_DEVTREE_PATH, node_path, prop); diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index f542b8e..9ea193d 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -9327,13 +9327,13 @@ static void init_ppc_proc (CPUPPCState *env, const ppc_def_t *def) nb_tlb *= 2; switch (env->tlb_type) { case TLB_6XX: - env->tlb.tlb6 = qemu_mallocz(nb_tlb * sizeof(ppc6xx_tlb_t)); + env->tlb.tlb6 = g_malloc0(nb_tlb * sizeof(ppc6xx_tlb_t)); break; case TLB_EMB: - env->tlb.tlbe = qemu_mallocz(nb_tlb * sizeof(ppcemb_tlb_t)); + env->tlb.tlbe = g_malloc0(nb_tlb * sizeof(ppcemb_tlb_t)); break; case TLB_MAS: - env->tlb.tlbm = qemu_mallocz(nb_tlb * sizeof(ppcmas_tlb_t)); + env->tlb.tlbm = g_malloc0(nb_tlb * sizeof(ppcmas_tlb_t)); break; } /* Pre-compute some useful values */ |