From nobody Tue Oct 28 12:16: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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515380206769426.3427984143932; Sun, 7 Jan 2018 18:56:46 -0800 (PST) Received: from localhost ([::1]:59419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNcD-0007Fa-U0 for importer@patchew.org; Sun, 07 Jan 2018 21:56:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNTA-0007U5-Tv for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYNT7-00035a-RO for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:24 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:43137) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYNT7-00035A-MH for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:21 -0500 Received: by mail-qt0-x244.google.com with SMTP id w10so12062257qtb.10 for ; Sun, 07 Jan 2018 18:47:21 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d10sm7156245qkg.16.2018.01.07.18.47.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2018 18:47:20 -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=IZkFUGCPcOH70lwEh1534Z6FkDQByklmdgX3pP3aY3k=; b=YOlktY1dZLcIVGmAbPNoN1hCUIGwbEVYJP/ulIaSGtYsCQAk3dpEZ4Pxm2V/W+BoNQ wRDzHpP9KMeu/VzcCiaSNWWEy+0waeuQbY3E23DFnghJAiXfYROmADVufd648pEKIzy1 R503SYrav6cADUUVIvRyIwqWkY/kEwgRAKicsfB3/rPGLVC/5CdwMS20KEPTgj+QQpIg TXxwoz99rMqylS3eWT/mXRYF8l81NnKr6jzoVZmEXbE6xDi+G53Jro+cfy+ju2DH2Czu lKCpy11JKRe8eFBDXXo5ZfhHz4OGtaoV9JNDkolNnS1lwUPdgfEXIVrHJrb2H0SQSL/4 Cu9g== 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=IZkFUGCPcOH70lwEh1534Z6FkDQByklmdgX3pP3aY3k=; b=Xjr6P63sDBg86vH+l5Mm9llI3umSMFugLRC+xcFYKFETOw0AiojRTNonKEScW7UxDx UctsXCh/AykotcZO1ax0XR6qZFJ1rtn8oCFG/v4rQxALtks0jjDKc42iDvRiR4KP5FOa GPgbF8xN548u/EwRBzP8jlErRziTBpBCCW/UQjb4Hsq4pvLjGycK4K+HccwkcG/P1ALm pyKT5bfOfkMGUz5kIhZcZ4anqvA5YgmkIeK+YwvqgOGzZsacCdLwG7gKowU2sAqCwgZ2 luZoo6Ufwdy0Gc5H0oWKmir0du/k2PqDVyzeXC3s5PX743Y5FkrJtvcbppJEBgxEWP8Y S0uQ== X-Gm-Message-State: AKwxytfGJPHK/PlDOEfGqQGBhxwQ4Sc4KowY0HhJLgYSi2BP+Lh/kY32 0WXLEldHil2uGbrlaS+SUcg= X-Google-Smtp-Source: ACJfBota2P3mg3n0oTMjXho6dAX9c1D9SEoYyWb66dpXAjeJHHyWTeGrsnegHyDf3uYDyHMpnm994Q== X-Received: by 10.200.40.115 with SMTP id 48mr15454527qtr.335.1515379641139; Sun, 07 Jan 2018 18:47:21 -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:50 -0300 Message-Id: <20180108024558.17983-22-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 21/29] piix: move southbridge related declarations/definitions to i82371_piix.h 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 , Yongbok Kim , =?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 --- include/hw/acpi/piix4.h | 6 ------ include/hw/i386/pc.h | 12 ------------ include/hw/southbridge/i82371_piix.h | 17 +++++++++++++++++ hw/acpi/piix4.c | 2 +- hw/i386/acpi-build.c | 2 +- hw/i386/pc_piix.c | 1 + hw/mips/mips_malta.c | 2 +- hw/pci-host/piix.c | 1 - MAINTAINERS | 1 - 9 files changed, 21 insertions(+), 23 deletions(-) delete mode 100644 include/hw/acpi/piix4.h diff --git a/include/hw/acpi/piix4.h b/include/hw/acpi/piix4.h deleted file mode 100644 index 26c2370e30..0000000000 --- a/include/hw/acpi/piix4.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef HW_ACPI_PIIX4_H -#define HW_ACPI_PIIX4_H - -Object *piix4_pm_find(void); - -#endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 195c02febe..768428db3b 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -236,12 +236,6 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0); =20 #define PORT92_A20_LINE "a20" =20 -/* acpi_piix.c */ - -I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, - qemu_irq sci_irq, qemu_irq smi_irq, - int smm_enabled, DeviceState **piix4_pm); - /* hpet.c */ extern int no_hpet; =20 @@ -254,12 +248,6 @@ typedef struct PCII440FXState PCII440FXState; =20 #define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" =20 -/* - * Reset Control Register: PCI-accessible ISA-Compatible Register at addre= ss - * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:7000). - */ -#define RCR_IOPORT 0xcf9 - PCIBus *i440fx_init(const char *host_type, const char *pci_type, PCII440FXState **pi440fx_state, int *piix_devfn, ISABus **isa_bus, qemu_irq *pic, diff --git a/include/hw/southbridge/i82371_piix.h b/include/hw/southbridge/= i82371_piix.h index 95ac25becd..8a5f9a7596 100644 --- a/include/hw/southbridge/i82371_piix.h +++ b/include/hw/southbridge/i82371_piix.h @@ -10,8 +10,25 @@ #define HW_ISA_PIIX_H =20 #include "hw/pci/pci.h" +#include "hw/isa/isa.h" + +#define TYPE_PIIX4_PCI_DEVICE "PIIX4" + +#define PIIX_NUM_PIRQS 4ULL /* PIRQ[A-D] */ + +/* + * Reset Control Register: PCI-accessible ISA-Compatible Register at addre= ss + * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:7000). + */ +#define RCR_IOPORT 0xcf9 =20 /* piix4.c */ extern PCIDevice *piix4_dev; =20 +/* acpi_piix.c */ +Object *piix4_pm_find(void); +I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, + qemu_irq sci_irq, qemu_irq smi_irq, + int smm_enabled, DeviceState **piix4_pm); + #endif /* HW_ISA_PIIX_H */ diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 32caa4f0fc..7e37587f3a 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/southbridge/i82371_piix.h" #include "hw/isa/apm.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" @@ -31,7 +32,6 @@ #include "exec/ioport.h" #include "hw/nvram/fw_cfg.h" #include "exec/address-spaces.h" -#include "hw/acpi/piix4.h" #include "hw/acpi/pcihp.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 5a6dee081c..d166187bc5 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -48,7 +48,7 @@ #include "sysemu/numa.h" =20 /* Supported chipsets: */ -#include "hw/acpi/piix4.h" +#include "hw/southbridge/i82371_piix.h" #include "hw/acpi/pcihp.h" #include "hw/i386/ich9.h" #include "hw/pci/pci_bus.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 5e47528993..89606c85db 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -31,6 +31,7 @@ #include "hw/smbios/smbios.h" #include "hw/pci/pci.h" #include "hw/pci/pci_ids.h" +#include "hw/southbridge/i82371_piix.h" #include "hw/usb.h" #include "net/net.h" #include "hw/boards.h" diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 84b4d5c423..03fe98e35e 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -26,7 +26,7 @@ #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" -#include "hw/i386/pc.h" +#include "hw/southbridge/i82371_piix.h" #include "hw/isa/superio.h" #include "hw/char/serial.h" #include "net/net.h" diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index a684a7cca9..0bd22fa33a 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -55,7 +55,6 @@ typedef struct I440FXState { } I440FXState; =20 #define PIIX_NUM_PIC_IRQS 16 /* i8259 * 2 */ -#define PIIX_NUM_PIRQS 4ULL /* PIRQ[A-D] */ #define XEN_PIIX_NUM_PIRQS 128ULL #define PIIX_PIRQC 0x60 =20 diff --git a/MAINTAINERS b/MAINTAINERS index cead15b69b..968f32f93d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -859,7 +859,6 @@ F: hw/i2c/smbus_ich9.c F: hw/acpi/piix4.c F: hw/acpi/ich9.c F: include/hw/acpi/ich9.h -F: include/hw/acpi/piix4.h F: hw/misc/sga.c =20 PC Chipset --=20 2.15.1