| Message ID | 719299533b89aa4516966065eae05c75744f50d3.1672868854.git.balaton@eik.bme.hu |
|---|---|
| State | New |
| Headers | show |
| Series | Misc ppc/mac machines clean up | expand |
On 4/1/23 22: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. Typo "unneeded". > 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(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Am 4. Januar 2023 21:59:37 UTC schrieb BALATON Zoltan <balaton@eik.bme.hu>: >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: Bernhard Beschow <shentey@gmail.com>
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.
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);
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(-)