diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-23 23:03:57 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-01-25 22:02:54 +0100 |
| commit | d037834a9d3847499e8a146bd1893a5c856411be (patch) | |
| tree | 976fdc56cb0ba9f6e66d14cd77b5596ce7b81ab4 /hw/ppc/mac_newworld.c | |
| parent | 7b925079e36cf26ca2e1f8db84b771ddc3d6340c (diff) | |
| download | qemu-d037834a9d3847499e8a146bd1893a5c856411be.tar.gz | |
macio: Split MacIO in two
Let the machines create two different types. This prepares to move
knowledge about sub-devices from the machines into the devices.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/ppc/mac_newworld.c')
| -rw-r--r-- | hw/ppc/mac_newworld.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index f3c01bfc58..a62a6e9a3c 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -147,6 +147,7 @@ static void ppc_core99_init(QEMUMachineInitArgs *args) hwaddr kernel_base, initrd_base, cmdline_base = 0; long kernel_size, initrd_size; PCIBus *pci_bus; + PCIDevice *macio; MacIONVRAMState *nvr; int bios_size; MemoryRegion *pic_mem, *dbdma_mem, *cuda_mem, *escc_mem; @@ -374,7 +375,8 @@ static void ppc_core99_init(QEMUMachineInitArgs *args) adb_kbd_init(&adb_bus); adb_mouse_init(&adb_bus); - macio_init(pci_bus, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, 0, pic_mem, + macio = pci_create(pci_bus, -1, TYPE_NEWWORLD_MACIO); + macio_init(macio, pic_mem, dbdma_mem, cuda_mem, NULL, 3, ide_mem, escc_bar); if (usb_enabled(machine_arch == ARCH_MAC99_U3)) { |