On 8/23/19 4:32 PM, Philippe Mathieu-Daudé wrote:
> As explained in commit aff39be0ed97:
>
> Both functions, object_initialize() and object_property_add_child()
> increase the reference counter of the new object, so one of the
> references has to be dropped afterwards to get the reference
> counting right. Otherwise the child object will not be properly
> cleaned up when the parent gets destroyed.
> Thus let's use now object_initialize_child() instead to get the
> reference counting here right.
>
> Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> hw/arm/mcimx7d-sabre.c | 9 ++++-----
> hw/arm/mps2-tz.c | 15 +++++++--------
> hw/arm/musca.c | 9 +++++----
> 3 files changed, 16 insertions(+), 17 deletions(-)
>
> diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c
> index 97b8bb788a..78b87c502f 100644
> --- a/hw/arm/mcimx7d-sabre.c
> +++ b/hw/arm/mcimx7d-sabre.c
> @@ -30,7 +30,6 @@ static void mcimx7d_sabre_init(MachineState *machine)
> {
> static struct arm_boot_info boot_info;
> MCIMX7Sabre *s = g_new0(MCIMX7Sabre, 1);
> - Object *soc;
> int i;
>
> if (machine->ram_size > FSL_IMX7_MMDC_SIZE) {
> @@ -49,10 +48,10 @@ static void mcimx7d_sabre_init(MachineState *machine)
> .nb_cpus = machine->smp.cpus,
> };
>
> - object_initialize(&s->soc, sizeof(s->soc), TYPE_FSL_IMX7);
> - soc = OBJECT(&s->soc);
> - object_property_add_child(OBJECT(machine), "soc", soc, &error_fatal);
> - object_property_set_bool(soc, true, "realized", &error_fatal);
> + object_initialize_child(OBJECT(machine), "soc",
> + &s->soc, sizeof(s->soc),
> + TYPE_FSL_IMX7, &error_fatal, NULL);
You could fit that into two instead of three lines.
But it's just a cosmetic nit, so:
Reviewed-by: Thomas Huth <th...@redhat.com>
