ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

machine: use class base init generated name 

machine_class_base_init() member name is allocated by
machine_class_base_init(), but not freed by
machine_class_finalize().  Simply freeing there doesn't work,
because DEFINE_PC_MACHINE() overwrites it with a literal string.

Fix DEFINE_PC_MACHINE() not to overwrite it, and add the missing
free to machine_class_finalize().

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-07-13 12:45:50 +02:00
parent ac64c5fdf8
commit 8ea753718b
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/core/machine.c
View File

@ -561,6 +561,7 @@ static void machine_class_finalize(ObjectClass *klass, void *data)
if (mc->compat_props) { if (mc->compat_props) {
g_array_free(mc->compat_props, true); g_array_free(mc->compat_props, true);
} }
g_free(mc->name);
} }
void machine_register_compat_props(MachineState *machine) void machine_register_compat_props(MachineState *machine)

2
include/hw/boards.h
View File

@ -93,7 +93,7 @@ struct MachineClass {
/*< public >*/ /*< public >*/
const char *family; /* NULL iff @name identifies a standalone machtype */ const char *family; /* NULL iff @name identifies a standalone machtype */
const char *name; char *name;
const char *alias; const char *alias;
const char *desc; const char *desc;

1
include/hw/i386/pc.h
View File

@ -903,7 +903,6 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
{ \ { \
MachineClass *mc = MACHINE_CLASS(oc); \ MachineClass *mc = MACHINE_CLASS(oc); \
optsfn(mc); \ optsfn(mc); \
mc->name = namestr; \
mc->init = initfn; \ mc->init = initfn; \
} \ } \
static const TypeInfo pc_machine_type_##suffix = { \ static const TypeInfo pc_machine_type_##suffix = { \