From nobody Tue Dec 16 05:37:31 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152098336717343.210696773664836; Tue, 13 Mar 2018 16:22:47 -0700 (PDT) Received: from localhost ([::1]:43470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evtFi-00019k-PR for importer@patchew.org; Tue, 13 Mar 2018 19:22:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsiU-00068o-1E for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsiR-0003wZ-Bv for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:22 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34371) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsiR-0003vR-57 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:19 -0400 Received: by mail-wm0-x244.google.com with SMTP id a20so16163387wmd.1 for ; Tue, 13 Mar 2018 15:48:18 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:48:17 -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=fsIp2Nv7x6GepK3jyHdbM7JBBrTAlyfnrLOIrDr58eY=; b=afagOQb2o9osGIZGzylmqqQsYX0I+YgRvoLVYsg55dIPCKQ9Ls/+B0aJI0dZd/FLkB U/tJ3BVCfZrzaIQu9BKqSfBNSrrlahhtbNHzhCIJ/J0mKg/r2+0rAGFk/rFIZscP7j9q Kzd84iuqbN3MFkBf8JU9+xMqW6sL5yeox09N7tmgHGnM/dA9NNxUvIYTMS35FTU0vWez scgotjosmo9fk5fiVejktLFfBs50qw4T1CBbBsc3MX5FIzHrNtajUHTWJHX0NJqG8o6C zGXGQ3tMJFAl98uADUYgcRYc+uJ8E+hoZHJpSWAoBiZ7Lz/lrODaaHdw08jNcc/7O7DD RXzg== 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=fsIp2Nv7x6GepK3jyHdbM7JBBrTAlyfnrLOIrDr58eY=; b=kFptrSAG7Uxw+52J61sVIoGXtbyKjRANH+ygt+bhYrfCeh5yhZ0eiR/BiGgurtOTpz IpdbhcN7AV+pau7TUSaUUFvo9VRbOnxjc4ICvzApWZ5dz2CfMLsUKl3/b0mI4O/+JlTt kqDfNO/aKinYlLQxjGg+6ULvz62Su+rz1qcTey8guANBVwaEOL+Ik7th7ldv+7wh+cg+ aVJIBolEfLHgH7ox9A8yDmGaNZxY05UhI/Na00PKOxMESrjLhKWUxDvNg7vuNgLlr+Dm BYr+0nEVFlePb3XtOq+a3O9OKM3tbTA4wo4P6X2K3nzv0VoUiVRMFvU7G0FSa2uvNsb5 IMbA== X-Gm-Message-State: AElRT7FMAjhV0NL7sE4O98VvruqAzzikMkZlrt3bUnq8CUTgURoC+KAx gt/IalIQ2gpyslMw1CyCUJOWV/qF X-Google-Smtp-Source: AG47ELuUNCoAyi19a6WF8Jk8cdQbZBeZ89LGILNcwrlMQ8484L2MFz40V6zYYTwXOLEmxVprxVeXWA== X-Received: by 10.28.17.77 with SMTP id 74mr2091152wmr.67.1520981297696; Tue, 13 Mar 2018 15:48:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:55 +0100 Message-Id: <20180313224719.4954-46-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 45/69] hw/isa/vt82c686: Add the TYPE_VT82C686B_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+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 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20180308223946.26784-20-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/isa/vt82c686.c | 20 ++++++++++++++++++++ hw/mips/mips_fulong2e.c | 15 +++------------ include/hw/isa/vt82c686.h | 2 ++ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 7eaf3c7e8f..cff1946232 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -17,6 +17,7 @@ #include "hw/i2c/smbus.h" #include "hw/pci/pci.h" #include "hw/isa/isa.h" +#include "hw/isa/superio.h" #include "hw/sysbus.h" #include "hw/mips/mips.h" #include "hw/isa/apm.h" @@ -519,11 +520,30 @@ static const TypeInfo via_info =3D { }, }; =20 +static void vt82c686b_superio_class_init(ObjectClass *klass, void *data) +{ + ISASuperIOClass *sc =3D ISA_SUPERIO_CLASS(klass); + + sc->serial.count =3D 2; + sc->parallel.count =3D 1; + sc->ide.count =3D 0; + sc->floppy.count =3D 1; +} + +static const TypeInfo via_superio_info =3D { + .name =3D TYPE_VT82C686B_SUPERIO, + .parent =3D TYPE_ISA_SUPERIO, + .instance_size =3D sizeof(ISASuperIODevice), + .class_size =3D sizeof(ISASuperIOClass), + .class_init =3D vt82c686b_superio_class_init, +}; + static void vt82c686b_register_types(void) { type_register_static(&via_ac97_info); type_register_static(&via_mc97_info); type_register_static(&via_pm_info); + type_register_static(&via_superio_info); type_register_static(&via_info); } =20 diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index b14dab8781..02fb2fdcc4 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -23,9 +23,7 @@ #include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/dma/i8257.h" -#include "hw/char/serial.h" -#include "hw/char/parallel.h" -#include "hw/block/fdc.h" +#include "hw/isa/superio.h" #include "net/net.h" #include "hw/boards.h" #include "hw/i2c/smbus.h" @@ -33,7 +31,6 @@ #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "hw/pci/pci.h" -#include "sysemu/sysemu.h" #include "audio/audio.h" #include "qemu/log.h" #include "hw/loader.h" @@ -43,8 +40,6 @@ #include "hw/isa/vt82c686.h" #include "hw/timer/mc146818rtc.h" #include "hw/timer/i8254.h" -#include "hw/input/i8042.h" -#include "sysemu/blockdev.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" #include "qemu/error-report.h" @@ -249,6 +244,8 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus,= int slot, qemu_irq intc, /* init other devices */ i8254_pit_init(isa_bus, 0x40, 0, NULL); i8257_dma_init(isa_bus, 0); + /* Super I/O */ + isa_create_simple(isa_bus, TYPE_VT82C686B_SUPERIO); =20 ide_drive_get(hd, ARRAY_SIZE(hd)); vt82c686b_ide_init(pci_bus, hd, PCI_DEVFN(slot, 1)); @@ -261,12 +258,6 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus= , int slot, qemu_irq intc, /* Audio support */ vt82c686b_ac97_init(pci_bus, PCI_DEVFN(slot, 5)); vt82c686b_mc97_init(pci_bus, PCI_DEVFN(slot, 6)); - - /* Super I/O */ - isa_create_simple(isa_bus, TYPE_I8042); - - serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); - parallel_hds_isa_init(isa_bus, 1); } =20 /* Network support */ diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index db97c8ed7a..c3c2b6e786 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -1,6 +1,8 @@ #ifndef HW_VT82C686_H #define HW_VT82C686_H =20 +#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" + /* vt82c686.c */ ISABus *vt82c686b_isa_init(PCIBus * bus, int devfn); void vt82c686b_ac97_init(PCIBus *bus, int devfn); --=20 2.14.3