falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mips: use object_new() instead of gnew()+object_initialize() 

object_initialize() is intended for inplace initialization of
objects, but here it's first allocated with g_new0() and then
initialized with object_initialize(). QEMU already has API
to do this (object_new), so do object creation with suitable
for usecase API.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1507211474-188400-36-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-10-05 15:51:09 +02:00 committed by Eduardo Habkost
parent e9135ab399
commit 81491c2846
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/mips/boston.c
View File

@ -460,7 +460,6 @@ static void boston_mach_init(MachineState *machine)
s = BOSTON(dev); s = BOSTON(dev);
s->mach = machine; s->mach = machine;
s->cps = g_new0(MIPSCPSState, 1);
if (!cpu_supports_cps_smp(cpu_model)) { if (!cpu_supports_cps_smp(cpu_model)) {
error_report("Boston requires CPUs which support CPS"); error_report("Boston requires CPUs which support CPS");
@ -469,7 +468,7 @@ static void boston_mach_init(MachineState *machine)
is_64b = cpu_supports_isa(cpu_model, ISA_MIPS64); is_64b = cpu_supports_isa(cpu_model, ISA_MIPS64);
object_initialize(s->cps, sizeof(MIPSCPSState), TYPE_MIPS_CPS); s->cps = MIPS_CPS(object_new(TYPE_MIPS_CPS));
qdev_set_parent_bus(DEVICE(s->cps), sysbus_get_default()); qdev_set_parent_bus(DEVICE(s->cps), sysbus_get_default());
object_property_set_str(OBJECT(s->cps), cpu_model, "cpu-model", &err); object_property_set_str(OBJECT(s->cps), cpu_model, "cpu-model", &err);

3
hw/mips/mips_malta.c
View File

@ -949,9 +949,8 @@ static void create_cps(MaltaState *s, const char *cpu_model,
qemu_irq *cbus_irq, qemu_irq *i8259_irq) qemu_irq *cbus_irq, qemu_irq *i8259_irq)
{ {
Error *err = NULL; Error *err = NULL;
s->cps = g_new0(MIPSCPSState, 1);
object_initialize(s->cps, sizeof(MIPSCPSState), TYPE_MIPS_CPS); s->cps = MIPS_CPS(object_new(TYPE_MIPS_CPS));
qdev_set_parent_bus(DEVICE(s->cps), sysbus_get_default()); qdev_set_parent_bus(DEVICE(s->cps), sysbus_get_default());
object_property_set_str(OBJECT(s->cps), cpu_model, "cpu-model", &err); object_property_set_str(OBJECT(s->cps), cpu_model, "cpu-model", &err);