[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 13/55] hw/ppc: Eliminate two superfluous QOM casts
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH 13/55] hw/ppc: Eliminate two superfluous QOM casts |
Date: |
Tue, 26 May 2020 13:56:20 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 |
On 5/19/20 4:55 PM, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> hw/ppc/mac_newworld.c | 4 ++--
> hw/ppc/mac_oldworld.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 69281d7834..2d069dcc59 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -122,7 +122,7 @@ static void ppc_core99_init(MachineState *machine)
> long kernel_size, initrd_size;
> UNINHostState *uninorth_pci;
> PCIBus *pci_bus;
> - NewWorldMacIOState *macio;
> + PCIDevice *macio;
> bool has_pmu, has_adb;
> MACIOIDEState *macio_ide;
> BusState *adb_bus;
> @@ -375,7 +375,7 @@ static void ppc_core99_init(MachineState *machine)
> pci_bus = PCI_HOST_BRIDGE(uninorth_pci)->bus;
>
> /* MacIO */
> - macio = NEWWORLD_MACIO(pci_create(pci_bus, -1, TYPE_NEWWORLD_MACIO));
> + macio = pci_create(pci_bus, -1, TYPE_NEWWORLD_MACIO);
> dev = DEVICE(macio);
> qdev_prop_set_uint64(dev, "frequency", tbfreq);
> qdev_prop_set_bit(dev, "has-pmu", has_pmu);
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index cfc2eae1d9..f73ec5f3a9 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -94,7 +94,7 @@ static void ppc_heathrow_init(MachineState *machine)
> uint32_t kernel_base, initrd_base, cmdline_base = 0;
> int32_t kernel_size, initrd_size;
> PCIBus *pci_bus;
> - OldWorldMacIOState *macio;
> + PCIDevice *macio;
> MACIOIDEState *macio_ide;
> SysBusDevice *s;
> DeviceState *dev, *pic_dev;
> @@ -278,7 +278,7 @@ static void ppc_heathrow_init(MachineState *machine)
> ide_drive_get(hd, ARRAY_SIZE(hd));
>
> /* MacIO */
> - macio = OLDWORLD_MACIO(pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO));
> + macio = pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO);
> dev = DEVICE(macio);
> qdev_prop_set_uint64(dev, "frequency", tbfreq);
> object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic",
>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
- [PATCH 01/55] qdev: Rename qbus_realize() to qbus_init(), (continued)
- [PATCH 01/55] qdev: Rename qbus_realize() to qbus_init(), Markus Armbruster, 2020/05/19
- [PATCH 02/55] qdev: Drop redundant bus realization, Markus Armbruster, 2020/05/19
- [PATCH 05/55] qdev: Convert to qbus_realize(), qbus_unrealize(), Markus Armbruster, 2020/05/19
- [PATCH 07/55] qdev: Convert to qdev_unrealize() manually, Markus Armbruster, 2020/05/19
- [PATCH 06/55] qdev: Convert to qdev_unrealize() with Coccinelle, Markus Armbruster, 2020/05/19
- [PATCH 13/55] hw/ppc: Eliminate two superfluous QOM casts, Markus Armbruster, 2020/05/19
- Re: [PATCH 13/55] hw/ppc: Eliminate two superfluous QOM casts,
Philippe Mathieu-Daudé <=
- [PATCH 19/55] isa: Convert uses of isa_create(), isa_try_create() manually, Markus Armbruster, 2020/05/19
- [PATCH 20/55] isa: isa_create(), isa_try_create() are now unused, drop, Markus Armbruster, 2020/05/19
- [PATCH 09/55] qdev: Convert uses of qdev_create() manually, Markus Armbruster, 2020/05/19
- [PATCH 31/55] auxbus: Convert a use of qdev_set_parent_bus(), Markus Armbruster, 2020/05/19
- [PATCH 23/55] ssi: Convert last use of ssi_create_slave_no_init() manually, Markus Armbruster, 2020/05/19
- [PATCH 30/55] auxbus: New aux_realize_bus(), pairing with aux_init_bus(), Markus Armbruster, 2020/05/19
- [PATCH 11/55] qdev: Convert uses of qdev_set_parent_bus() manually, Markus Armbruster, 2020/05/19