From patchwork Sat Dec 16 21:29:57 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: 849571 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="MKrbdBfs"; 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 3yzgmf692Cz9t1t for ; Sun, 17 Dec 2017 08:44:18 +1100 (AEDT) Received: from localhost ([::1]:52269 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQKFl-00085W-0L for incoming@patchwork.ozlabs.org; Sat, 16 Dec 2017 16:44:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQK8M-0002Pc-4c for qemu-devel@nongnu.org; Sat, 16 Dec 2017 16:36:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQK8L-0006Wb-B8 for qemu-devel@nongnu.org; Sat, 16 Dec 2017 16:36:38 -0500 Received: from iserv.reactos.org ([2a01:4f8:221:4c5::3]:40130) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQK8L-0006V6-4o for qemu-devel@nongnu.org; Sat, 16 Dec 2017 16:36:37 -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=G/4Ui+N0yMqOPvHN7OScsdtq277Ikq8QM0TFAzFZwo4=; b=MKrbdBfsfeGRxQvvLe/dzHK4q/se6AtMgelLBF57COk+Pgp/rJ3i8/wzUGUxZ3XWNk04NbQ0SfU+vDsqdJxW9nVL9UqPi45CzTDDDVOd8WTpX7nykS7BfVAih07mwPSP/kMl/zCVKh5kZo/Fpaj6MGWJlI/BY8nSjKlVhsF0GMk=; 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 1eQK7C-0002si-Ae; Sat, 16 Dec 2017 21:35:27 +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:57 +0100 Message-Id: <20171216213004.30393-9-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 08/15] piix4: add a i8257 dma 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 i8257 instanciated in malta board, to not have it twice. Signed-off-by: Hervé Poussineau --- hw/isa/piix4.c | 3 +++ hw/mips/mips_malta.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index eb2f730fff..66fdfe25e2 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -158,6 +158,9 @@ static void piix4_realize(PCIDevice *pci, Error **errp) /* initialize ISA irqs */ isa_bus_irqs(isa_bus, s->isa); + /* DMA */ + DMA_init(isa_bus, 0); + piix4_dev = pci; qemu_register_reset(piix4_reset, s); } diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index a1397c3304..8b2a574673 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1205,7 +1205,6 @@ void mips_malta_init(MachineState *machine) smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); g_free(smbus_eeprom_buf); pit = pit_init(isa_bus, 0x40, 0, NULL); - DMA_init(isa_bus, 0); /* Super I/O */ isa_create_simple(isa_bus, "i8042");