{"id":856675,"url":"http://patchwork.ozlabs.org/api/patches/856675/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20180108024558.17983-24-f4bug@amsat.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","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-24-f4bug@amsat.org>","list_archive_url":null,"date":"2018-01-08T02:45:52","name":"[23/29] hw/i386: extract i440fx related declarations/definitions to i440fx.h","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3329fe1900e3c40f3cafc8fb35a34d4381bba7fb","submitter":{"id":70924,"url":"http://patchwork.ozlabs.org/api/people/70924/?format=json","name":"Philippe Mathieu-Daudé","email":"f4bug@amsat.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20180108024558.17983-24-f4bug@amsat.org/mbox/","series":[{"id":21847,"url":"http://patchwork.ozlabs.org/api/series/21847/?format=json","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/856675/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/856675/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","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=\"SUVBihjs\"; 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 3zFKfK0xhKz9ryr\n\tfor ;\n\tMon, 8 Jan 2018 13:56:09 +1100 (AEDT)","from localhost ([::1]:59417 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1eYNbb-0006Wi-8A\n\tfor incoming@patchwork.ozlabs.org; Sun, 07 Jan 2018 21:56:07 -0500","from eggs.gnu.org ([2001:4830:134:3::10]:51712)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from )\n\tid 1eYNTG-0007Yj-3G\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:34 -0500","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from )\n\tid 1eYNTE-0003Bs-VM\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:30 -0500","from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:46954)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1eYNTE-0003Bh-Pq\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:28 -0500","by mail-qk0-x241.google.com with SMTP id l12so12196081qke.13\n\tfor ; Sun, 07 Jan 2018 18:47:28 -0800 (PST)","from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id\n\td10sm7156245qkg.16.2018.01.07.18.47.24\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 07 Jan 2018 18:47:27 -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=Q0mJs1CiBgULiGXLtq3Ilxs8jSZUTUdrkdbGZi3wh04=;\n\tb=SUVBihjs338HqYhRgA/x+HMTyfN5UJ8zjFyMHX612hwIDg213xCQBLdxJl9NQSOGdj\n\ttX0XdP+j6Qjaig+3cEnWH1r9eW2RG5D5ZUs+3SqC4fQ5M8xGjnem7vyH/jFVlwidCL0j\n\t+E9OyIL04KM+qYDslRszkBM2X/V7GV7fLYbL4JquHXiTdGFZqoBjWx1Z4mSx2xtW0oKh\n\tXSjG7yWP19U7czvBvfKieJGmeEJCO+LCLte6q8to1Dx79cGCDa1g/QwKaHHAtqEWYD2V\n\tWwTh0H29z211jnVcD2lts+rFJYrbaCb/WYtD9QbeZczuplS7xhHTkDTEC1s+9OqlxCEE\n\tU0Dg==","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=Q0mJs1CiBgULiGXLtq3Ilxs8jSZUTUdrkdbGZi3wh04=;\n\tb=mFLNB+Cnt31aornTc8YmRjcgdeHjdFst1Y56mMgZ2KIysiTHnX+2wyBfU/SwgaxBh/\n\t2gnMwrSNbjwlKPsPhiUG8VFUP+rsX8Aa21VgIYYu7iptCROaP2Olp+C0HzgCyxcv9lOT\n\t8E4IVJtq5nPzF6WrBLnTVRuWzz7SY8Vhme+ZtmooFjqkpkpWKF7M7/p4ntkoC6IjUopf\n\t52RbvB3dgc18WK9dlPLVTBVyphZGgBhhFrvFffa0Y53f8UZGrGtqSdU+yxz3N90ZaNJa\n\tSrOWZsiMBINmVGfaxQcZMwppNumie6EHW5h7c75G/nPkLKZtLXc1mdZR1SGTMdfjBJMV\n\tq17g==","X-Gm-Message-State":"AKwxytcypqH0l+nYrlxl/FcQp/ono5c/XMp582X5Pk+4udag4V3QzCux\n\t1U/rnuW6GZQqTmXu4lQYg98=","X-Google-Smtp-Source":"ACJfBou0DOchj2cIZ3NeFClYFP0KTiqZryqGyZmZ2B/i4LOmpLrzJ1l7kJwCotaSt9yI9ODvpqpenA==","X-Received":"by 10.55.158.65 with SMTP id h62mr14580918qke.158.1515379648251; \n\tSun, 07 Jan 2018 18:47:28 -0800 (PST)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","To":"Paolo Bonzini ,\n\t\"Michael S. Tsirkin\" , =?utf-8?q?Herv=C3=A9_Poussinea?=\n\t=?utf-8?q?u?= ,\n\tAurelien Jarno , Eduardo Habkost\n\t, Marcel Apfelbaum ","Date":"Sun, 7 Jan 2018 23:45:52 -0300","Message-Id":"<20180108024558.17983-24-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:c09::241","Subject":"[Qemu-devel] [PATCH 23/29] hw/i386: extract i440fx related\n\tdeclarations/definitions to i440fx.h","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Igor Mammedov , Richard Henderson ,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n\tqemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Philippe Mathieu-Daudé \n---\n include/hw/i386/pc.h | 22 -------------------\n include/hw/pci-host/i440fx.h | 51 ++++++++++++++++++++++++++++++++++++++++++++\n hw/acpi/pcihp.c | 2 +-\n hw/i386/pc_piix.c | 1 +\n hw/pci-host/piix.c | 1 +\n stubs/pci-host-piix.c | 3 ++-\n MAINTAINERS | 1 +\n 7 files changed, 57 insertions(+), 24 deletions(-)\n create mode 100644 include/hw/pci-host/i440fx.h","diff":"diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h\nindex 768428db3b..b63fdbd9e2 100644\n--- a/include/hw/i386/pc.h\n+++ b/include/hw/i386/pc.h\n@@ -239,28 +239,6 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0);\n /* hpet.c */\n extern int no_hpet;\n \n-/* piix_pci.c */\n-struct PCII440FXState;\n-typedef struct PCII440FXState PCII440FXState;\n-\n-#define TYPE_I440FX_PCI_HOST_BRIDGE \"i440FX-pcihost\"\n-#define TYPE_I440FX_PCI_DEVICE \"i440FX\"\n-\n-#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE \"igd-passthrough-i440FX\"\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,\n- MemoryRegion *address_space_mem,\n- MemoryRegion *address_space_io,\n- ram_addr_t ram_size,\n- ram_addr_t below_4g_mem_size,\n- ram_addr_t above_4g_mem_size,\n- MemoryRegion *pci_memory,\n- MemoryRegion *ram_memory);\n-\n-PCIBus *find_i440fx(void);\n-\n /* pc_sysfw.c */\n void pc_system_firmware_init(MemoryRegion *rom_memory,\n bool isapc_ram_fw);\ndiff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h\nnew file mode 100644\nindex 0000000000..c796382d52\n--- /dev/null\n+++ b/include/hw/pci-host/i440fx.h\n@@ -0,0 +1,51 @@\n+/*\n+ * QEMU i440FX North Bridge Emulation\n+ *\n+ * Copyright (c) 2006 Fabrice Bellard\n+ *\n+ * Permission is hereby granted, free of charge, to any person obtaining a copy\n+ * of this software and associated documentation files (the \"Software\"), to deal\n+ * in the Software without restriction, including without limitation the rights\n+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+ * copies of the Software, and to permit persons to whom the Software is\n+ * furnished to do so, subject to the following conditions:\n+ *\n+ * The above copyright notice and this permission notice shall be included in\n+ * all copies or substantial portions of the Software.\n+ *\n+ * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL\n+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n+ * THE SOFTWARE.\n+ */\n+#ifndef HW_PCI_HOST_I440FX_H\n+#define HW_PCI_HOST_I440FX_H\n+\n+#include \"qemu-common.h\"\n+#include \"hw/hw.h\"\n+\n+struct PCII440FXState;\n+typedef struct PCII440FXState PCII440FXState;\n+\n+#define TYPE_I440FX_PCI_HOST_BRIDGE \"i440FX-pcihost\"\n+#define TYPE_I440FX_PCI_DEVICE \"i440FX\"\n+\n+#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE \"igd-passthrough-i440FX\"\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,\n+ MemoryRegion *address_space_mem,\n+ MemoryRegion *address_space_io,\n+ ram_addr_t ram_size,\n+ ram_addr_t below_4g_mem_size,\n+ ram_addr_t above_4g_mem_size,\n+ MemoryRegion *pci_memory,\n+ MemoryRegion *ram_memory);\n+\n+PCIBus *find_i440fx(void);\n+\n+#endif /* HW_PCI_HOST_I440FX_H */\ndiff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c\nindex 7da51c0569..51a65a34a1 100644\n--- a/hw/acpi/pcihp.c\n+++ b/hw/acpi/pcihp.c\n@@ -28,8 +28,8 @@\n #include \"hw/acpi/pcihp.h\"\n \n #include \"hw/hw.h\"\n-#include \"hw/i386/pc.h\"\n #include \"hw/pci/pci.h\"\n+#include \"hw/pci-host/i440fx.h\"\n #include \"hw/acpi/acpi.h\"\n #include \"sysemu/sysemu.h\"\n #include \"exec/ioport.h\"\ndiff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c\nindex 89606c85db..326ca302dc 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/pci-host/i440fx.h\"\n #include \"hw/southbridge/i82371_piix.h\"\n #include \"hw/usb.h\"\n #include \"net/net.h\"\ndiff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c\nindex 6e8cea8372..6f963b5a07 100644\n--- a/hw/pci-host/piix.c\n+++ b/hw/pci-host/piix.c\n@@ -27,6 +27,7 @@\n #include \"hw/i386/pc.h\"\n #include \"hw/pci/pci.h\"\n #include \"hw/pci/pci_host.h\"\n+#include \"hw/pci-host/i440fx.h\"\n #include \"hw/southbridge/i82371_piix.h\"\n #include \"hw/isa/isa.h\"\n #include \"hw/sysbus.h\"\ndiff --git a/stubs/pci-host-piix.c b/stubs/pci-host-piix.c\nindex 6ed81b1f21..93975adbfe 100644\n--- a/stubs/pci-host-piix.c\n+++ b/stubs/pci-host-piix.c\n@@ -1,5 +1,6 @@\n #include \"qemu/osdep.h\"\n-#include \"hw/i386/pc.h\"\n+#include \"hw/pci-host/i440fx.h\"\n+\n PCIBus *find_i440fx(void)\n {\n return NULL;\ndiff --git a/MAINTAINERS b/MAINTAINERS\nindex 968f32f93d..c3efcd2316 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -859,6 +859,7 @@ 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/pci-host/i440fx.h\n F: hw/misc/sga.c\n \n PC Chipset\n","prefixes":["23/29"]}