From nobody Tue Oct 28 12:16:33 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515380356837557.8589177340883; Sun, 7 Jan 2018 18:59:16 -0800 (PST) Received: from localhost ([::1]:59439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNed-000128-Uf for importer@patchew.org; Sun, 07 Jan 2018 21:59:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNSR-0006ms-AP for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYNSO-0002Of-8e for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:39 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:41722) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYNSO-0002OV-3g for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:36 -0500 Received: by mail-qt0-x244.google.com with SMTP id i40so12055850qti.8 for ; Sun, 07 Jan 2018 18:46:35 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d10sm7156245qkg.16.2018.01.07.18.46.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2018 18:46:32 -0800 (PST) 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=OyXBDoIQWzI2frpS1vRP6vtUZc5iSiVS21RSq72TzP4=; b=dscQdBiv/pGpMuCHAFTTYOX8V09fsHTKRYYyjzPCA8UCbMvE4zg3mMoYbJjeYeeEhl peMo/GJGATSbcFb96q6ytuhfRxfRZrhbnN0GV8MMVM+ElbLT8G7bTqurdPk7SSzroBWk Ehm0jq6syvLWnJFftq3I+SgRSeu3gujySTfeqEfISQNUeMFt9hPvAbA1v8H6FEa4xCAT XlhAcpHNr8nYekmo1Uaa3Gmd8nsAMNdKMmp765beXWtk8wf6MORuRx0uqXKQBjV9riiE YDk+9gFpfwHvlUZlqb6hhz+KCSzarTIwozuX2I9eO/Q87hd2pGYAhhr5ISEhjM9avZ5/ sGkA== 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=OyXBDoIQWzI2frpS1vRP6vtUZc5iSiVS21RSq72TzP4=; b=RbBoVIuTBApl8ryYlfzMo66ioBpaKETMg3vMFDr3l0x9LBLK6/5YmSBdJ9QQzdAYtc /E0uzPPHPGZ3t9SQZZyP09QA5EAzxwtrw64GYH7mCCyq+GrntWIG8t/CDI9ukHswT+sA C01CrxONj0jijyUH8K9pjfvpPRrzTQccnI5S3pnzRE1r2zYMa9AAtSducUD6L4884t7e MXOKe8uyuuaxAoiSfcdWvFJIlsKyMnELGxRO/0gjYGS3bCzEC35zUUVrHu+XnEhVEot/ NKDgkp3QleYV+IBNvNTttyr56Bnwx/gmUZg7gSNXdSPVohZfufZDgudJ/4ScfiOqxdx6 v/cQ== X-Gm-Message-State: AKwxytfaH35raiVI2OiSyM7kYMmWcwNk9b6/OWHuuS1vEpl/8CWm/Stn CaH+J5Xi0l1c+g/Jigr1ueE= X-Google-Smtp-Source: ACJfBou5VTLSUKkSBKYngLW+c6tPxBfZkB5HetL0rKoJjuP25D7aUnNW1bn6ofUAy2xgbOf1AUxg3g== X-Received: by 10.200.42.196 with SMTP id c4mr14505545qta.208.1515379593394; Sun, 07 Jan 2018 18:46:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Eduardo Habkost , Marcel Apfelbaum Date: Sun, 7 Jan 2018 23:45:36 -0300 Message-Id: <20180108024558.17983-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180108024558.17983-1-f4bug@amsat.org> References: <20180108024558.17983-1-f4bug@amsat.org> 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: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH 07/29] hw/i386/pc: use isa_superio_init() 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: Igor Mammedov , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e5c4e48ebb..f9479351f3 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -24,12 +24,9 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" -#include "hw/char/serial.h" -#include "hw/char/parallel.h" #include "hw/i386/apic.h" #include "hw/i386/topology.h" #include "sysemu/cpus.h" -#include "hw/block/fdc.h" #include "hw/ide.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" @@ -41,6 +38,7 @@ #include "multiboot.h" #include "hw/timer/mc146818rtc.h" #include "hw/dma/i8257.h" +#include "hw/isa/superio.h" #include "hw/timer/i8254.h" #include "hw/input/i8042.h" #include "hw/audio/pcspk.h" @@ -1523,7 +1521,6 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *= gsi, uint32_t hpet_irqs) { int i; - DriveInfo *fd[MAX_FD]; DeviceState *hpet =3D NULL; int pit_isa_irq =3D 0; qemu_irq pit_alt_irq =3D NULL; @@ -1586,11 +1583,9 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq = *gsi, pcspk_init(isa_bus, pit); } =20 - serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); - parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS); - a20_line =3D qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2); - i8042 =3D isa_create_simple(isa_bus, "i8042"); + i8042 =3D isa_superio_init(isa_bus, MAX_SERIAL_PORTS, 1, + create_fdctrl ? MAX_FD : 0); i8042_setup_a20_line(i8042, a20_line[0]); if (!no_vmport) { vmport_init(isa_bus); @@ -1608,14 +1603,6 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq = *gsi, g_free(a20_line); =20 i8257_dma_init(isa_bus, 0); - - for(i =3D 0; i < MAX_FD; i++) { - fd[i] =3D drive_get(IF_FLOPPY, 0, i); - create_fdctrl |=3D !!fd[i]; - } - if (create_fdctrl) { - fdctrl_init_isa(isa_bus, fd); - } } =20 void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus) --=20 2.15.1