From patchwork Tue Mar 13 22:47:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10281225 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C4723601A0 for ; Tue, 13 Mar 2018 23:33:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B44D422230 for ; Tue, 13 Mar 2018 23:33:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8E92285CB; Tue, 13 Mar 2018 23:33:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 154A422230 for ; Tue, 13 Mar 2018 23:33:42 +0000 (UTC) Received: from localhost ([::1]:43536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evtQL-0003uE-7X for patchwork-qemu-devel@patchwork.kernel.org; Tue, 13 Mar 2018 19:33:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsiX-0006Cz-GZ for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsiW-000416-Ls for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:25 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:51060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsiW-00040N-ET for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:24 -0400 Received: by mail-wm0-x242.google.com with SMTP id w128so869810wmw.0 for ; Tue, 13 Mar 2018 15:48:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0E9eeR2DIbZwar82apkB3N6g1950iHi59y2WLzde1RM=; b=nabVJL/kZP2PnjsQjRj86AMmdmPGZ1hnq3PVeVHPRCn4YbOduK0RX8ckTI6mUO5dBN kfku4nMWgWKDCyzIxz58ANEg8Fln1qaYte1ikB6YyLkIG+zDCe6WS+UZ5BxlYVObo/fC C7wVqGABmAwl1l7SNPXtgZS2CzG+lYZjUz6jxJcfhYLZeIYrx/h7+E/AdS+pSZCGf4vP obBnKzz0ot/AHymuStpsDTsas4bLhFnpy2RtfU6dGA0vkOD8B/DmOsW4cMojIy/CbA3j cNFuJvwWDxwXF32v+Dy7cOTVfrCHCGQIwMeva74ql+qGFb0XLRJ6lhmIeO4+BYHGD0hY tXiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0E9eeR2DIbZwar82apkB3N6g1950iHi59y2WLzde1RM=; b=GuZDPuO4a3hNUkDLyrt+eZaxon/4HKz1mFAXzgFgQyQmlFCKMihmX0RHy6ytCLcrk2 pH+48LplfX8weJRQ5EraZ+rh2AEbqAF7FUk3r3bwlhjgPywrWA0JAYAvDVpj8890FxXy 5U2YccRTfzmlFIKqVEpB3DoPl+X9woNURW3kyMFRT6PJXHf7k/CouGSHvcE+gIp0eWXu 88JNg+P4A79XzInzAr9FPtZzFcS/Z0Jz2Th5LH9wI5GwER+aGRZv8YZIcF+Ef7MBe3iU mX1SZS16cpKZpbfapfFEmnZQxRjOiNC8WX8fkaxCQGpMV28DwzwFyMlWanFIpbKzN2wZ l6Vg== X-Gm-Message-State: AElRT7GhpBo2wCY8/jewyLBbhg0qOy+QRZtaWVXYeAembtX3W8x9oSu6 la/q1yfJHf/EIedPbkC9uG8ifZ/4 X-Google-Smtp-Source: AG47ELttB8pPQKTMHt8Y5bIcbVvu2NmB0bfW7I358k9ouWkA94apPF4x4QVn44EpdWicrexy9Ocmrw== X-Received: by 10.28.16.21 with SMTP id 21mr2075851wmq.109.1520981302994; Tue, 13 Mar 2018 15:48:22 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.48.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:48:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:47:00 +0100 Message-Id: <20180313224719.4954-51-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 50/69] hw/alpha/dp264: Use the TYPE_SMC37C669_SUPERIO 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?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180308223946.26784-25-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 3 +++ hw/alpha/dp264.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak index 3740adc5e9..bbe361f01a 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -7,6 +7,9 @@ CONFIG_SERIAL_ISA=y CONFIG_I82374=y CONFIG_I8254=y CONFIG_I8257=y +CONFIG_PARALLEL=y +CONFIG_PARALLEL_ISA=y +CONFIG_FDC=y CONFIG_PCKBD=y CONFIG_VGA_CIRRUS=y CONFIG_IDE_CORE=y diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index ffad678ea7..80b987f7fb 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -19,8 +19,7 @@ #include "hw/timer/mc146818rtc.h" #include "hw/ide.h" #include "hw/timer/i8254.h" -#include "hw/input/i8042.h" -#include "hw/char/serial.h" +#include "hw/isa/superio.h" #include "hw/dma/i8257.h" #include "qemu/cutils.h" @@ -83,14 +82,10 @@ static void clipper_init(MachineState *machine) mc146818_rtc_init(isa_bus, 1900, rtc_irq); i8254_pit_init(isa_bus, 0x40, 0, NULL); - isa_create_simple(isa_bus, TYPE_I8042); /* VGA setup. Don't bother loading the bios. */ pci_vga_init(pci_bus); - /* Serial code setup. */ - serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); - /* Network setup. e1000 is good enough, failing Tulip support. */ for (i = 0; i < nb_nics; i++) { pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL); @@ -99,6 +94,9 @@ static void clipper_init(MachineState *machine) /* 2 82C37 (dma) */ isa_create_simple(isa_bus, "i82374"); + /* Super I/O */ + isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO); + /* IDE disk setup. */ { DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];