On 5/19/20 4:55 PM, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <[email protected]> > --- > 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é <[email protected]>
