On Fri, Feb 16, 2024 at 12:03:12PM +0100, Philippe Mathieu-Daudé wrote:
> Date: Fri, 16 Feb 2024 12:03:12 +0100
> From: Philippe Mathieu-Daudé
> Subject: [PATCH 21/21] hw: Add QOM parentship relation with CPUs
> X-Mailer: git-send-email 2.41.0
>
> QDev objects created with object_new() need to manually add
> their parent relationship with object_property_add_child().
>
> Signed-off-by: Philippe Mathieu-Daudé
> ---
> hw/i386/x86.c| 1 +
> hw/microblaze/petalogix_ml605_mmu.c | 1 +
> hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 +
> hw/mips/cps.c| 1 +
> hw/nios2/10m50_devboard.c| 1 +
> hw/ppc/e500.c| 1 +
> hw/ppc/spapr.c | 1 +
> 7 files changed, 7 insertions(+)
Reviewed-by: Zhao Liu
>
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index 684dce90e9..7021419d91 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -102,6 +102,7 @@ void x86_cpu_new(X86MachineState *x86ms, int64_t apic_id,
> Error **errp)
> if (!object_property_set_uint(cpu, "apic-id", apic_id, errp)) {
> goto out;
> }
> +object_property_add_child(OBJECT(x86ms), "cpu[*]", OBJECT(cpu));
> qdev_realize(DEVICE(cpu), NULL, errp);
>
> out:
> diff --git a/hw/microblaze/petalogix_ml605_mmu.c
> b/hw/microblaze/petalogix_ml605_mmu.c
> index 0f5fabc32e..dfd881322d 100644
> --- a/hw/microblaze/petalogix_ml605_mmu.c
> +++ b/hw/microblaze/petalogix_ml605_mmu.c
> @@ -83,6 +83,7 @@ petalogix_ml605_init(MachineState *machine)
>
> /* init CPUs */
> cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU));
> +object_property_add_child(OBJECT(machine), "cpu", OBJECT(cpu));
> object_property_set_str(OBJECT(cpu), "version", "8.10.a", _abort);
> /* Use FPU but don't use floating point conversion and square
> * root instructions
> diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c
> b/hw/microblaze/petalogix_s3adsp1800_mmu.c
> index dad46bd7f9..255d8d4d47 100644
> --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
> +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
> @@ -70,6 +70,7 @@ petalogix_s3adsp1800_init(MachineState *machine)
> MemoryRegion *sysmem = get_system_memory();
>
> cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU));
> +object_property_add_child(OBJECT(machine), "cpu", OBJECT(cpu));
> object_property_set_str(OBJECT(cpu), "version", "7.10.d", _abort);
> qdev_realize(DEVICE(cpu), NULL, _abort);
>
> diff --git a/hw/mips/cps.c b/hw/mips/cps.c
> index 07b73b0a1f..6b4e918807 100644
> --- a/hw/mips/cps.c
> +++ b/hw/mips/cps.c
> @@ -84,6 +84,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
> /* All cores use the same clock tree */
> qdev_connect_clock_in(DEVICE(cpu), "clk-in", s->clock);
>
> +object_property_add_child(OBJECT(dev), "cpu[*]", OBJECT(cpu));
> if (!qdev_realize_and_unref(DEVICE(cpu), NULL, errp)) {
> return;
> }
> diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c
> index 6cb32f777b..f6a691d340 100644
> --- a/hw/nios2/10m50_devboard.c
> +++ b/hw/nios2/10m50_devboard.c
> @@ -95,6 +95,7 @@ static void nios2_10m50_ghrd_init(MachineState *machine)
> cpu->exception_addr = 0xc8000120;
> cpu->fast_tlb_miss_addr = 0xc100;
>
> +object_property_add_child(OBJECT(machine), "cpu", OBJECT(cpu));
> qdev_realize_and_unref(DEVICE(cpu), NULL, _fatal);
>
> if (nms->vic) {
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index 3bd12b54ab..77b7d2858c 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -956,6 +956,7 @@ void ppce500_init(MachineState *machine)
> */
> object_property_set_bool(OBJECT(cs), "start-powered-off", i != 0,
> _abort);
> +object_property_add_child(OBJECT(machine), "cpu[*]", OBJECT(cpu));
> qdev_realize_and_unref(DEVICE(cs), NULL, _fatal);
>
> if (!firstenv) {
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 0d72d286d8..b6e5caa0d2 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2715,6 +2715,7 @@ static void spapr_init_cpus(SpaprMachineState *spapr)
> _fatal);
> object_property_set_int(core, CPU_CORE_PROP_CORE_ID, core_id,
> _fatal);
> +object_property_add_child(OBJECT(spapr), "cpu[*]", OBJECT(core));
> qdev_realize(DEVICE(core), NULL, _fatal);
>
> object_unref(core);
> --
> 2.41.0
>
>
