From nobody Tue Oct 28 04:11:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514558507359670.4224854412239; Fri, 29 Dec 2017 06:41:47 -0800 (PST) Received: from localhost ([::1]:42952 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUvr0-0000SV-9L for importer@patchew.org; Fri, 29 Dec 2017 09:41:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUvg7-0000Dk-E7 for qemu-devel@nongnu.org; Fri, 29 Dec 2017 09:30:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUvg6-0006HQ-F5 for qemu-devel@nongnu.org; Fri, 29 Dec 2017 09:30:31 -0500 Received: from iserv.reactos.org ([2a01:4f8:221:4c5::3]:38294) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eUvg6-0006Bm-9Y for qemu-devel@nongnu.org; Fri, 29 Dec 2017 09:30:30 -0500 Received: from [2a01:e34:ee6b:9c80:6267:20ff:fe65:a488] (helo=localhost.localdomain) by iserv.reactos.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1eUvfX-0002om-9p; Fri, 29 Dec 2017 14:29:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=reactos.org; s=25047; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Jsz3l0uFI0QAsezGbmMesFeoG/HCXzu7OBEYMOFXJ6g=; b=sicsC090iT0Lh+SXT9OjBsxer+2Lf5NxcBkcPr9AgMUdJVaa+uli1Bg/eG6hb3pMEAQ/j74rFq+N2He7JD+dPF/zMG6VvIWOhKcdLaYPVVNFMQvAtQBkC6vs9jVGtBR9tW1LPl/hTtEX02H9DQgqTr3dKjmHWLjwIL8gB6iaZI4=; From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: Aurelien Jarno , Yongbok Kim , "Michael S . Tsirkin" , Paolo Bonzini , qemu-devel@nongnu.org Date: Fri, 29 Dec 2017 15:29:16 +0100 Message-Id: <20171229142922.31701-11-hpoussin@reactos.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171229142922.31701-1-hpoussin@reactos.org> References: <20171229142922.31701-1-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:4f8:221:4c5::3 Subject: [Qemu-devel] [PATCH v3 10/16] piix4: add a i8042 keyboard/mouse controller as specified in datasheet X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Remove i8042 instanciated in malta board, to not have it twice. Signed-off-by: Herv=C3=A9 Poussineau --- 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 1fd9f4f330..c5639f7640 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); =20 + /* Super I/O */ + isa_create_simple(isa_bus, "i8042"); + piix4_dev =3D pci; 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); =20 /* 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); --=20 2.11.0