Re: [PATCH v7 2/7] mac_{old, new}world: Use local variable instead of qdev_get_machine()

[Mark Cave-Ayland]

On 04/01/2023 21:59, BALATON Zoltan wrote:

> We already have machine in a local variable so no need to use
> qdev_get_machine(), also remove now unneded line break.
>
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
>   hw/ppc/mac_newworld.c | 3 +--
>   hw/ppc/mac_oldworld.c | 3 +--
>   2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 601ea518f8..460c14b5e3 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -466,8 +466,7 @@ static void ppc_core99_init(MachineState *machine)
>       fw_cfg = FW_CFG(dev);
>       qdev_prop_set_uint32(dev, "data_width", 1);
>       qdev_prop_set_bit(dev, "dma_enabled", false);
> -    object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG,
> -                              OBJECT(fw_cfg));
> +    object_property_add_child(OBJECT(machine), TYPE_FW_CFG, OBJECT(fw_cfg));
>       s = SYS_BUS_DEVICE(dev);
>       sysbus_realize_and_unref(s, &error_fatal);
>       sysbus_mmio_map(s, 0, CFG_ADDR);
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index 558c639202..5a7b25a4a8 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -303,8 +303,7 @@ static void ppc_heathrow_init(MachineState *machine)
>       fw_cfg = FW_CFG(dev);
>       qdev_prop_set_uint32(dev, "data_width", 1);
>       qdev_prop_set_bit(dev, "dma_enabled", false);
> -    object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG,
> -                              OBJECT(fw_cfg));
> +    object_property_add_child(OBJECT(machine), TYPE_FW_CFG, OBJECT(fw_cfg));
>       s = SYS_BUS_DEVICE(dev);
>       sysbus_realize_and_unref(s, &error_fatal);
>       sysbus_mmio_map(s, 0, CFG_ADDR);

Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


ATB,

Mark.