Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/856673/?format=api
{ "id": 856673, "url": "http://patchwork.ozlabs.org/api/patches/856673/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20180108024558.17983-22-f4bug@amsat.org/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20180108024558.17983-22-f4bug@amsat.org>", "list_archive_url": null, "date": "2018-01-08T02:45:50", "name": "[21/29] piix: move southbridge related declarations/definitions to i82371_piix.h", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "97d9eead5d808784b9525e890bf38da0ec8b1103", "submitter": { "id": 70924, "url": "http://patchwork.ozlabs.org/api/people/70924/?format=api", "name": "Philippe Mathieu-Daudé", "email": "f4bug@amsat.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20180108024558.17983-22-f4bug@amsat.org/mbox/", "series": [ { "id": 21847, "url": "http://patchwork.ozlabs.org/api/series/21847/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=21847", "date": "2018-01-08T02:45:30", "name": "remove i386/pc dependency: generic SuperIO, PIIX cleanup", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/21847/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/856673/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/856673/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"YOlktY1d\"; dkim-atps=neutral" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3zFKdl0K00z9ryr\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 8 Jan 2018 13:55:39 +1100 (AEDT)", "from localhost ([::1]:59406 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1eYNb7-0005qP-46\n\tfor incoming@patchwork.ozlabs.org; Sun, 07 Jan 2018 21:55:37 -0500", "from eggs.gnu.org ([2001:4830:134:3::10]:51676)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1eYNTA-0007U5-Tv\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:26 -0500", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1eYNT7-00035a-RO\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:24 -0500", "from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:43137)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1eYNT7-00035A-MH\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:21 -0500", "by mail-qt0-x244.google.com with SMTP id w10so12062257qtb.10\n\tfor <qemu-devel@nongnu.org>; Sun, 07 Jan 2018 18:47:21 -0800 (PST)", "from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id\n\td10sm7156245qkg.16.2018.01.07.18.47.17\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 07 Jan 2018 18:47:20 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=IZkFUGCPcOH70lwEh1534Z6FkDQByklmdgX3pP3aY3k=;\n\tb=YOlktY1dZLcIVGmAbPNoN1hCUIGwbEVYJP/ulIaSGtYsCQAk3dpEZ4Pxm2V/W+BoNQ\n\twRDzHpP9KMeu/VzcCiaSNWWEy+0waeuQbY3E23DFnghJAiXfYROmADVufd648pEKIzy1\n\tR503SYrav6cADUUVIvRyIwqWkY/kEwgRAKicsfB3/rPGLVC/5CdwMS20KEPTgj+QQpIg\n\tTXxwoz99rMqylS3eWT/mXRYF8l81NnKr6jzoVZmEXbE6xDi+G53Jro+cfy+ju2DH2Czu\n\tlKCpy11JKRe8eFBDXXo5ZfhHz4OGtaoV9JNDkolNnS1lwUPdgfEXIVrHJrb2H0SQSL/4\n\tCu9g==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references:mime-version:content-transfer-encoding;\n\tbh=IZkFUGCPcOH70lwEh1534Z6FkDQByklmdgX3pP3aY3k=;\n\tb=Xjr6P63sDBg86vH+l5Mm9llI3umSMFugLRC+xcFYKFETOw0AiojRTNonKEScW7UxDx\n\tUctsXCh/AykotcZO1ax0XR6qZFJ1rtn8oCFG/v4rQxALtks0jjDKc42iDvRiR4KP5FOa\n\tGPgbF8xN548u/EwRBzP8jlErRziTBpBCCW/UQjb4Hsq4pvLjGycK4K+HccwkcG/P1ALm\n\tpyKT5bfOfkMGUz5kIhZcZ4anqvA5YgmkIeK+YwvqgOGzZsacCdLwG7gKowU2sAqCwgZ2\n\tluZoo6Ufwdy0Gc5H0oWKmir0du/k2PqDVyzeXC3s5PX743Y5FkrJtvcbppJEBgxEWP8Y\n\tS0uQ==", "X-Gm-Message-State": "AKwxytfGJPHK/PlDOEfGqQGBhxwQ4Sc4KowY0HhJLgYSi2BP+Lh/kY32\n\t0WXLEldHil2uGbrlaS+SUcg=", "X-Google-Smtp-Source": "ACJfBota2P3mg3n0oTMjXho6dAX9c1D9SEoYyWb66dpXAjeJHHyWTeGrsnegHyDf3uYDyHMpnm994Q==", "X-Received": "by 10.200.40.115 with SMTP id 48mr15454527qtr.335.1515379641139; \n\tSun, 07 Jan 2018 18:47:21 -0800 (PST)", "From": "=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>", "To": "Paolo Bonzini <pbonzini@redhat.com>,\n\t\"Michael S. Tsirkin\" <mst@redhat.com>, =?utf-8?q?Herv=C3=A9_Poussinea?=\n\t=?utf-8?q?u?= <hpoussin@reactos.org>,\n\tAurelien Jarno <aurelien@aurel32.net>, Eduardo Habkost\n\t<ehabkost@redhat.com>, Marcel Apfelbaum <marcel@redhat.com>", "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": "8bit", "X-detected-operating-system": "by eggs.gnu.org: Genre and OS details not\n\trecognized.", "X-Received-From": "2607:f8b0:400d:c0d::244", "Subject": "[Qemu-devel] [PATCH 21/29] piix: move southbridge related\n\tdeclarations/definitions to i82371_piix.h", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Igor Mammedov <imammedo@redhat.com>, Richard Henderson <rth@twiddle.net>,\n\tYongbok Kim <yongbok.kim@mips.com>, =?utf-8?q?Philippe_Mathieu-Daud?=\n\t=?utf-8?b?w6k=?= <f4bug@amsat.org>, \tqemu-devel@nongnu.org", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>\n---\n include/hw/acpi/piix4.h | 6 ------\n include/hw/i386/pc.h | 12 ------------\n include/hw/southbridge/i82371_piix.h | 17 +++++++++++++++++\n hw/acpi/piix4.c | 2 +-\n hw/i386/acpi-build.c | 2 +-\n hw/i386/pc_piix.c | 1 +\n hw/mips/mips_malta.c | 2 +-\n hw/pci-host/piix.c | 1 -\n MAINTAINERS | 1 -\n 9 files changed, 21 insertions(+), 23 deletions(-)\n delete mode 100644 include/hw/acpi/piix4.h", "diff": "diff --git a/include/hw/acpi/piix4.h b/include/hw/acpi/piix4.h\ndeleted file mode 100644\nindex 26c2370e30..0000000000\n--- a/include/hw/acpi/piix4.h\n+++ /dev/null\n@@ -1,6 +0,0 @@\n-#ifndef HW_ACPI_PIIX4_H\n-#define HW_ACPI_PIIX4_H\n-\n-Object *piix4_pm_find(void);\n-\n-#endif\ndiff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h\nindex 195c02febe..768428db3b 100644\n--- a/include/hw/i386/pc.h\n+++ b/include/hw/i386/pc.h\n@@ -236,12 +236,6 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0);\n \n #define PORT92_A20_LINE \"a20\"\n \n-/* acpi_piix.c */\n-\n-I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,\n- qemu_irq sci_irq, qemu_irq smi_irq,\n- int smm_enabled, DeviceState **piix4_pm);\n-\n /* hpet.c */\n extern int no_hpet;\n \n@@ -254,12 +248,6 @@ typedef struct PCII440FXState PCII440FXState;\n \n #define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE \"igd-passthrough-i440FX\"\n \n-/*\n- * Reset Control Register: PCI-accessible ISA-Compatible Register at address\n- * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:7000).\n- */\n-#define RCR_IOPORT 0xcf9\n-\n PCIBus *i440fx_init(const char *host_type, const char *pci_type,\n PCII440FXState **pi440fx_state, int *piix_devfn,\n ISABus **isa_bus, qemu_irq *pic,\ndiff --git a/include/hw/southbridge/i82371_piix.h b/include/hw/southbridge/i82371_piix.h\nindex 95ac25becd..8a5f9a7596 100644\n--- a/include/hw/southbridge/i82371_piix.h\n+++ b/include/hw/southbridge/i82371_piix.h\n@@ -10,8 +10,25 @@\n #define HW_ISA_PIIX_H\n \n #include \"hw/pci/pci.h\"\n+#include \"hw/isa/isa.h\"\n+\n+#define TYPE_PIIX4_PCI_DEVICE \"PIIX4\"\n+\n+#define PIIX_NUM_PIRQS 4ULL /* PIRQ[A-D] */\n+\n+/*\n+ * Reset Control Register: PCI-accessible ISA-Compatible Register at address\n+ * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:7000).\n+ */\n+#define RCR_IOPORT 0xcf9\n \n /* piix4.c */\n extern PCIDevice *piix4_dev;\n \n+/* acpi_piix.c */\n+Object *piix4_pm_find(void);\n+I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,\n+ qemu_irq sci_irq, qemu_irq smi_irq,\n+ int smm_enabled, DeviceState **piix4_pm);\n+\n #endif /* HW_ISA_PIIX_H */\ndiff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c\nindex 32caa4f0fc..7e37587f3a 100644\n--- a/hw/acpi/piix4.c\n+++ b/hw/acpi/piix4.c\n@@ -21,6 +21,7 @@\n #include \"qemu/osdep.h\"\n #include \"hw/hw.h\"\n #include \"hw/i386/pc.h\"\n+#include \"hw/southbridge/i82371_piix.h\"\n #include \"hw/isa/apm.h\"\n #include \"hw/i2c/pm_smbus.h\"\n #include \"hw/pci/pci.h\"\n@@ -31,7 +32,6 @@\n #include \"exec/ioport.h\"\n #include \"hw/nvram/fw_cfg.h\"\n #include \"exec/address-spaces.h\"\n-#include \"hw/acpi/piix4.h\"\n #include \"hw/acpi/pcihp.h\"\n #include \"hw/acpi/cpu_hotplug.h\"\n #include \"hw/acpi/cpu.h\"\ndiff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c\nindex 5a6dee081c..d166187bc5 100644\n--- a/hw/i386/acpi-build.c\n+++ b/hw/i386/acpi-build.c\n@@ -48,7 +48,7 @@\n #include \"sysemu/numa.h\"\n \n /* Supported chipsets: */\n-#include \"hw/acpi/piix4.h\"\n+#include \"hw/southbridge/i82371_piix.h\"\n #include \"hw/acpi/pcihp.h\"\n #include \"hw/i386/ich9.h\"\n #include \"hw/pci/pci_bus.h\"\ndiff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c\nindex 5e47528993..89606c85db 100644\n--- a/hw/i386/pc_piix.c\n+++ b/hw/i386/pc_piix.c\n@@ -31,6 +31,7 @@\n #include \"hw/smbios/smbios.h\"\n #include \"hw/pci/pci.h\"\n #include \"hw/pci/pci_ids.h\"\n+#include \"hw/southbridge/i82371_piix.h\"\n #include \"hw/usb.h\"\n #include \"net/net.h\"\n #include \"hw/boards.h\"\ndiff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c\nindex 84b4d5c423..03fe98e35e 100644\n--- a/hw/mips/mips_malta.c\n+++ b/hw/mips/mips_malta.c\n@@ -26,7 +26,7 @@\n #include \"qemu-common.h\"\n #include \"cpu.h\"\n #include \"hw/hw.h\"\n-#include \"hw/i386/pc.h\"\n+#include \"hw/southbridge/i82371_piix.h\"\n #include \"hw/isa/superio.h\"\n #include \"hw/char/serial.h\"\n #include \"net/net.h\"\ndiff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c\nindex a684a7cca9..0bd22fa33a 100644\n--- a/hw/pci-host/piix.c\n+++ b/hw/pci-host/piix.c\n@@ -55,7 +55,6 @@ typedef struct I440FXState {\n } I440FXState;\n \n #define PIIX_NUM_PIC_IRQS 16 /* i8259 * 2 */\n-#define PIIX_NUM_PIRQS 4ULL /* PIRQ[A-D] */\n #define XEN_PIIX_NUM_PIRQS 128ULL\n #define PIIX_PIRQC 0x60\n \ndiff --git a/MAINTAINERS b/MAINTAINERS\nindex cead15b69b..968f32f93d 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -859,7 +859,6 @@ F: hw/i2c/smbus_ich9.c\n F: hw/acpi/piix4.c\n F: hw/acpi/ich9.c\n F: include/hw/acpi/ich9.h\n-F: include/hw/acpi/piix4.h\n F: hw/misc/sga.c\n \n PC Chipset\n", "prefixes": [ "21/29" ] }