From patchwork Sat Dec 16 21:29:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 849564 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=reactos.org header.i=@reactos.org header.b="iVM+XOL0"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yzgdR4QLHz9t2M for ; Sun, 17 Dec 2017 08:38:03 +1100 (AEDT) Received: from localhost ([::1]:52232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQK9h-0002sQ-Kd for incoming@patchwork.ozlabs.org; Sat, 16 Dec 2017 16:38:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQK8t-0002qI-9w for qemu-devel@nongnu.org; Sat, 16 Dec 2017 16:37:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQK8s-0007ZR-Ft for qemu-devel@nongnu.org; Sat, 16 Dec 2017 16:37:11 -0500 Received: from iserv.reactos.org ([2a01:4f8:221:4c5::3]:40183) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQK8s-0007YI-90 for qemu-devel@nongnu.org; Sat, 16 Dec 2017 16:37:10 -0500 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=ziI+rVh/bkQnDwftorX34G0udI6xlwUSXlhVzn1UOyk=; b=iVM+XOL0jvptx10vbO6rmW0Aw9MxeArpTAvtURlopty5FpS0POOUI4i8aI+sVIHwLgAvAOCRKmHb1AAa8L/OIFlJvdtDIQTbKFHVofYYw2GHwr8fhPR0SqmyoOPdXIipSdGjxWlJ8QZc4MWTsuXKk+3vI/Nd1Bj3qQsUgksUcEs=; 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 1eQK8b-0002si-5E; Sat, 16 Dec 2017 21:36:53 +0000 From: =?utf-8?q?Herv=C3=A9_Poussineau?= To: Aurelien Jarno , Yongbok Kim , "Michael S . Tsirkin" , Paolo Bonzini , qemu-devel@nongnu.org Date: Sat, 16 Dec 2017 22:29:59 +0100 Message-Id: <20171216213004.30393-11-hpoussin@reactos.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171216213004.30393-1-hpoussin@reactos.org> References: <20171216213004.30393-1-hpoussin@reactos.org> MIME-Version: 1.0 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 v2 10/15] 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_Poussineau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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);