diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2009-08-28 19:37:00 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-09-04 09:37:34 -0500 |
| commit | ae027ad3c5ea9a041f46c22bcb52e879645ed171 (patch) | |
| tree | 2f9f29d214f4dc62cd0dccbc87ef74d6ea622fb7 /hw/ide.h | |
| parent | 7b8c51add768584118a14d84f799e73ab1ec988b (diff) | |
| download | qemu-ae027ad3c5ea9a041f46c22bcb52e879645ed171.zip qemu-ae027ad3c5ea9a041f46c22bcb52e879645ed171.tar.gz qemu-ae027ad3c5ea9a041f46c22bcb52e879645ed171.tar.bz2 | |
mips malta: Fix fdc regression and use qdev for i8042 setup
8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
breaks MIPS Malta:
Tried to create isa device isa-fdc with no isa bus present
Fix this by creating an isa bus for piix4.
This change also requires some more qdev related changes
(similar changes were applied to pc.c) and allows
cleaning of piix3/piix4 code.
Thanks to Gerd Hoffmann for his hints.
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ide.h')
| -rw-r--r-- | hw/ide.h | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -10,10 +10,8 @@ void isa_ide_init(int iobase, int iobase2, qemu_irq irq, /* ide-pci.c */ void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, int secondary_ide_enabled); -void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn, - qemu_irq *pic); -void pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn, - qemu_irq *pic); +void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); +void pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); /* ide-macio.c */ int pmac_ide_init (DriveInfo **hd_table, qemu_irq irq, |