From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQ8My-0004hW-NH for qemu-devel@nongnu.org; Sat, 16 Dec 2017 04:02:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQ8Mw-000218-R4 for qemu-devel@nongnu.org; Sat, 16 Dec 2017 04:02:56 -0500 Received: from iserv.reactos.org ([2a01:4f8:221:4c5::3]:58836) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQ8Mw-00020R-KN for qemu-devel@nongnu.org; Sat, 16 Dec 2017 04:02:54 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 16 Dec 2017 10:02:23 +0100 Message-Id: <20171216090228.28505-11-hpoussin@reactos.org> In-Reply-To: <20171216090228.28505-1-hpoussin@reactos.org> References: <20171216090228.28505-1-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 10/15] piix4: add a i8042 keyboard/mouse controller as specified in datasheet List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Aurelien Jarno , Yongbok Kim , "Michael S . Tsirkin" , Paolo Bonzini , qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Remove i8042 instanciated in malta board, to not have it twice. Signed-off-by: Hervé Poussineau --- 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