mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qom: Tidy up a few object_initialize_child() calls

Browse Source 
The callers of object_initialize_child() commonly  pass either
&child, sizeof(child), or pchild, sizeof(*pchild).  Tidy up the few
that don't, mostly to keep the next commit simpler.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-36-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-06-10 07:32:24 +02:00
parent cd9ae806cd
commit 19dc7e977c
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/aspeed.c
View File

@ -268,7 +268,7 @@ static void aspeed_machine_init(MachineState *machine)
memory_region_add_subregion(&bmc->ram_container, 0, machine->ram);
object_initialize_child(OBJECT(machine), "soc", &bmc->soc,
(sizeof(bmc->soc)), amc->soc_name, &error_abort,
sizeof(bmc->soc), amc->soc_name, &error_abort,
NULL);
sc = ASPEED_SOC_GET_CLASS(&bmc->soc);

3
hw/microblaze/xlnx-zynqmp-pmu.c
View File

@ -174,8 +174,7 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)
pmu_ram);
/* Create the PMU device */
object_initialize_child(OBJECT(machine), "pmu", pmu,
sizeof(XlnxZynqMPPMUSoCState),
object_initialize_child(OBJECT(machine), "pmu", pmu, sizeof(*pmu),
TYPE_XLNX_ZYNQMP_PMU_SOC, &error_abort, NULL);
object_property_set_bool(OBJECT(pmu), true, "realized", &error_fatal);

2
hw/pci-host/pnv_phb4.c
View File

@ -1155,7 +1155,7 @@ static void pnv_phb4_instance_init(Object *obj)
QLIST_INIT(&phb->dma_spaces);
/* XIVE interrupt source object */
object_initialize_child(obj, "source", &phb->xsrc, sizeof(XiveSource),
object_initialize_child(obj, "source", &phb->xsrc, sizeof(phb->xsrc),
TYPE_XIVE_SOURCE, &error_abort, NULL);
/* Root Port */

2
hw/riscv/riscv_hart.c
View File

@ -46,7 +46,7 @@ static void riscv_hart_realize(RISCVHartArrayState *s, int idx,
Error *err = NULL;
object_initialize_child(OBJECT(s), "harts[*]", &s->harts[idx],
sizeof(RISCVCPU), cpu_type,
sizeof(s->harts[idx]), cpu_type,
&error_abort, NULL);
s->harts[idx].env.mhartid = s->hartid_base + idx;
qemu_register_reset(riscv_harts_cpu_reset, &s->harts[idx]);