motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 17:23:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

macio: remove macio_init() function

Browse source 
Move the remaining comment into macio.c for reference, then remove the
macio_init() function and instantiate the macio devices for both Old World
and New World machines via qdev_init_nofail() directly.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Mark Cave-Ayland 2018-02-28 20:32:43 +00:00 • committed by David Gibson
parent aa79b0860e
commit b6712ea391
3 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/ppc/mac_oldworld.c
View file

@ -96,7 +96,6 @@ static void ppc_heathrow_init(MachineState *machine)
OldWorldMacIOState *macio;
MACIOIDEState *macio_ide;
DeviceState *dev, *pic_dev;
SysBusDevice *sbd;
BusState *adb_bus;
int bios_size, ndrv_size;
uint8_t *ndrv_file;
@ -283,8 +282,7 @@ static void ppc_heathrow_init(MachineState *machine)
qdev_prop_set_uint64(dev, "frequency", tbfreq);
object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic",
&error_abort);
sbd = SYS_BUS_DEVICE(pic_dev);
macio_init(PCI_DEVICE(macio), sysbus_mmio_get_region(sbd, 0));
qdev_init_nofail(dev);
macio_ide = MACIO_IDE(object_resolve_path_component(OBJECT(macio),
"ide[0]"));