Remove i8042 instanciated in malta board, to not have it twice.
Acked-by: Michael S. Tsirkin <m...@redhat.com>
Acked-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Hervé Poussineau <hpous...@reactos.org>
---
hw/isa/piix4.c | 3 +++
hw/mips/mips_malta.c | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 3f59750e5a..1aab78cdd2 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -169,6 +169,9 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
/* DMA */
DMA_init(isa_bus, 0);
+ /* Super I/O */
+ isa_create_simple(isa_bus, "i8042");
+
piix4_dev = pci_dev;
qemu_register_reset(piix4_reset, s);
}
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index afe13c684f..7498fad006 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1204,8 +1204,6 @@ void mips_malta_init(MachineState *machine)
g_free(smbus_eeprom_buf);
/* Super I/O */
- isa_create_simple(isa_bus, "i8042");
-
mc146818_rtc_init(isa_bus, 2000, NULL);
serial_hds_isa_init(isa_bus, 0, 2);
parallel_hds_isa_init(isa_bus, 1);
--
2.11.0
