From ae027ad3c5ea9a041f46c22bcb52e879645ed171 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 28 Aug 2009 19:37:00 +0200 Subject: 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 Signed-off-by: Anthony Liguori --- hw/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/pc.c') diff --git a/hw/pc.c b/hw/pc.c index 9004393..e5f3231 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1363,7 +1363,7 @@ static void pc_init1(ram_addr_t ram_size, } if (pci_enabled) { - pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1, isa_irq); + pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1); } else { for(i = 0; i < MAX_IDE_BUS; i++) { isa_ide_init(ide_iobase[i], ide_iobase2[i], -- cgit v1.1