[24/25] hw/alpha/dp264: Use the TYPE_SMC37C669_SUPERIO

Message ID	20180308223946.26784-25-f4bug@amsat.org
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> To: "Michael S . Tsirkin" <mst@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Herv=C3=A9_Poussineau?= <hpoussin@reactos.org>, Marcel Apfelbaum <marcel@redhat.com>, Richard Henderson <rth@twiddle.net>, Aurelien Jarno <aurelien@aurel32.net>, Alexey Kardashevskiy <aik@ozlabs.ru>, Thomas Huth <thuth@redhat.com> Date: Thu, 8 Mar 2018 23:39:45 +0100 Message-Id: <20180308223946.26784-25-f4bug@amsat.org> In-Reply-To: <20180308223946.26784-1-f4bug@amsat.org> References: <20180308223946.26784-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 24/25] hw/alpha/dp264: Use the TYPE_SMC37C669_SUPERIO Precedence: list Cc: Eduardo Habkost <ehabkost@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= <f4bug@amsat.org>, qemu-devel@nongnu.org, Guan Xuetao <gxt@mprc.pku.edu.cn>, Yongbok Kim <yongbok.kim@mips.com>, Artyom Tarasenko <atar4qemu@gmail.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	remove i386/pc dependency: generic SuperIO \| expand [00/25] remove i386/pc dependency: generic SuperIO [01/25] hw/isa: Move parallel_hds_isa_init() to hw/char/parallel-isa.c [02/25] hw/dma/i8257: Rename DMA_init() to i8257_dma_init() [03/25] hw/input/i8042: Extract declarations from i386/pc.h into input/i8042.h [04/25] MAINTAINERS: Fix the PC87312 include path [05/25] hw/isa/pc87312: Rename the device type as TYPE_PC87312_SUPERIO [06/25] hw/isa/pc87312: Use uint16_t for the ISA I/O base address [07/25] hw/isa/pc87312: Use 'unsigned int' for the irq value [08/25] hw/isa/superio: Add a Super I/O template based on the PC87312 device [09/25] hw/isa/pc87312: Inherit from the abstract TYPE_ISA_SUPERIO [10/25] hw/isa/superio: Factor out the parallel code from pc87312.c [11/25] hw/isa/superio: Factor out the serial code from pc87312.c [12/25] hw/isa/superio: Factor out the floppy disc controller code from pc87312.c [13/25] hw/isa/superio: Add a keyboard/mouse controller (8042) [14/25] hw/isa/superio: Factor out the IDE code from pc87312.c [15/25] hw/mips/malta: Code movement [16/25] hw/isa/superio: Factor out the FDC37M817 Super I/O from mips_malta.c [17/25] hw/mips/mips_fulong2e: Factor out vt82c686b_southbridge_init() [18/25] hw/isa/vt82c686: Rename vt82c686b_init() -> vt82c686b_isa_init() [19/25] hw/isa/vt82c686: Add the TYPE_VT82C686B_SUPERIO [20/25] MAINTAINERS: Add entries for the VT82C686B Super I/O [21/25] MAINTAINERS: Split the Alpha TCG/machine section [22/25] hw/isa/superio: Add the SMC FDC37C669 Super I/O [23/25] hw/alpha/dp264: Add the ISA DMA controller [24/25] hw/alpha/dp264: Use the TYPE_SMC37C669_SUPERIO [25/25] hw/i386/pc: Factor out the superio code

Message ID

20180308223946.26784-25-f4bug@amsat.org

State

New

Headers

From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
To: "Michael S . Tsirkin" <mst@redhat.com>, Paolo Bonzini
	<pbonzini@redhat.com>, =?utf-8?q?Herv=C3=A9_Poussineau?=
	<hpoussin@reactos.org>, Marcel Apfelbaum <marcel@redhat.com>,
	Richard Henderson <rth@twiddle.net>, Aurelien Jarno
	<aurelien@aurel32.net>, Alexey Kardashevskiy <aik@ozlabs.ru>,
	Thomas Huth <thuth@redhat.com>
Date: Thu,  8 Mar 2018 23:39:45 +0100
Message-Id: <20180308223946.26784-25-f4bug@amsat.org>
In-Reply-To: <20180308223946.26784-1-f4bug@amsat.org>
References: <20180308223946.26784-1-f4bug@amsat.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH 24/25] hw/alpha/dp264: Use the
	TYPE_SMC37C669_SUPERIO
Precedence: list
Cc: Eduardo Habkost <ehabkost@redhat.com>, Mark Cave-Ayland
	<mark.cave-ayland@ilande.co.uk>, =?utf-8?q?Philippe_Mathieu-Daud?=
	=?utf-8?b?w6k=?= <f4bug@amsat.org>, qemu-devel@nongnu.org,
	Guan Xuetao <gxt@mprc.pku.edu.cn>, Yongbok Kim <yongbok.kim@mips.com>,
	Artyom Tarasenko <atar4qemu@gmail.com>
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

remove i386/pc dependency: generic SuperIO | expand

Commit Message

Philippe Mathieu-Daudé March 8, 2018, 10:39 p.m. UTC

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 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];

[24/25] hw/alpha/dp264: Use the TYPE_SMC37C669_SUPERIO

Commit Message

Patch