From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 31 May 2018 13:50:52 +0000 (+0100)
Subject: arm: fix malloc type mismatch
X-Git-Tag: v3.0.0-rc0~123^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e3ef27c7c1ccbac589ad0a67c40b5df57e2af71;p=thirdparty%2Fqemu.git

arm: fix malloc type mismatch

cpregs_keys is an uint32_t* so the allocation should use uint32_t.
g_new is even better because it is type-safe.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c
index e80cfb47c7e..0c64c0292e4 100644
--- a/target/arm/gdbstub.c
+++ b/target/arm/gdbstub.c
@@ -157,8 +157,7 @@ int arm_gen_dynamic_xml(CPUState *cs)
     RegisterSysregXmlParam param = {cs, s};
 
     cpu->dyn_xml.num_cpregs = 0;
-    cpu->dyn_xml.cpregs_keys = g_malloc(sizeof(uint32_t *) *
-                                        g_hash_table_size(cpu->cp_regs));
+    cpu->dyn_xml.cpregs_keys = g_new(uint32_t, g_hash_table_size(cpu->cp_regs));
     g_string_printf(s, "<?xml version=\"1.0\"?>");
     g_string_append_printf(s, "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">");
     g_string_append_printf(s, "<feature name=\"org.qemu.gdb.arm.sys.regs\">");