[Qemu-devel] [PATCH 10/15] piix4: add a i8042 keyboard/mouse controller as specified in datasheet

[Hervé Poussineau]

Remove i8042 instanciated in malta board, to not have it twice.

Signed-off-by: Hervé Poussineau <address@hidden>
---
 hw/isa/piix4.c       | 3 +++
 hw/mips/mips_malta.c | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index c215bee1ff..cf134b01ee 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -165,6 +165,9 @@ static void piix4_realize(PCIDevice *pci, Error **errp)
     /* DMA */
     DMA_init(isa_bus, 0);
 
+    /* Super I/O */
+    isa_create_simple(isa_bus, "i8042");
+
     piix4_dev = pci;
     qemu_register_reset(piix4_reset, s);
 }
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 5a087fa75d..78049ccf86 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1203,9 +1203,6 @@ void mips_malta_init(MachineState *machine)
     smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
     g_free(smbus_eeprom_buf);
 
-    /* Super I/O */
-    isa_create_simple(isa_bus, "i8042");
-
     rtc_init(isa_bus, 2000, NULL);
     serial_hds_isa_init(isa_bus, 0, 2);
     parallel_hds_isa_init(isa_bus, 1);
-- 
2.11.0