{"id":856677,"url":"http://patchwork.ozlabs.org/api/patches/856677/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20180108024558.17983-18-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-18-f4bug@amsat.org>","list_archive_url":null,"date":"2018-01-08T02:45:46","name":"[17/29] piix: move piix4 declaration into new southbridge/i82371_piix.h","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"cd1c496c56906b2c02bfc9f2b9782e9f93ce1ec3","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-18-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/856677/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/856677/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=\"P2DJt+9+\"; 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 3zFKjD4YjHz9s82\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon,  8 Jan 2018 13:58:40 +1100 (AEDT)","from localhost ([::1]:59432 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 1eYNe2-0000LQ-JV\n\tfor incoming@patchwork.ozlabs.org; Sun, 07 Jan 2018 21:58:38 -0500","from eggs.gnu.org ([2001:4830:134:3::10]:51560)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1eYNSu-0007FQ-EL\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:09 -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 1eYNSt-0002mc-Ji\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:08 -0500","from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:34509)\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 1eYNSt-0002mT-Ee\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:47:07 -0500","by mail-qt0-x244.google.com with SMTP id 33so12079467qtv.1\n\tfor <qemu-devel@nongnu.org>; Sun, 07 Jan 2018 18:47:07 -0800 (PST)","from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id\n\td10sm7156245qkg.16.2018.01.07.18.47.03\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 07 Jan 2018 18:47:06 -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=SkgBRYF+Vfsu+2dJcRnSemO8p5LNSTPMjSVtAoxIXtU=;\n\tb=P2DJt+9+wNqgsVm4hzfO8HiB6fGcPogdYgVXUPoPuvGj636XQ5t7Z4/mN0mi25xdEq\n\tMlqI+nqcrrbpYyJztsIkQ0Cbdrj9A4qUmw+/FfLz6T9sMTHLwl96/u90c3L84DUTpdBY\n\tPUr7L5E9pjFkGm0UWKDkg2zb/DQptwySKcVs09pYg6WUir9czyG4CmVSEzPO774n+MUV\n\tbUzENI33grwsOoqAOzub+8DY9Ro7FUvwiSqhWk2Y04Y5dJCYEAqVeY82X1ttVUotTLgP\n\tMSBTyOBQQg6fdQYnvPQrIDZZviRkoOAHUuExJWBwmnki3zxhJPxhkXoU/c+KA4xqhWOn\n\tD1og==","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=SkgBRYF+Vfsu+2dJcRnSemO8p5LNSTPMjSVtAoxIXtU=;\n\tb=ip6GTR9KLd4L++ne+iuB9Htu6STq3JkgluoX8pLQxjEw6THJRo9KTILCl8L6s/yCkn\n\tWqxRW5PvM0JGXqCAOyKnjuLKKJ1a6TWk6xswRRiNsDelMpKa1HnmvCj2A307LyEvujoc\n\tsCoHHUG5mdv5EduS8v2jEn22noByrDi5qB6H9ItHI89elsNcPEJvDCgu7oFHcajLgXp8\n\tBYWsz7axseylMz1l/QQwajFLJvZojcbVanBFliBmSx0St+UMXNDRponMqgrGD2QVi4eP\n\tUwfUzWSfHtHIkIIyAfMUZN8Aad/w70gE23c19zRXq4Gqv/JAs9lXFNqTOuUZi2Xltku4\n\t8xXA==","X-Gm-Message-State":"AKwxytd5harb1irghO8wW4xVqbQn/3H+CVIOGUUCXhVdRKpivmcBnEmE\n\tmauDqAq8UgOQmfeBnsoUNZs=","X-Google-Smtp-Source":"ACJfBosFrzNOVmne2NqtK5UFCsRVO0ObMcRrKjREnxyDQRRbxPPJQGov8hZvgkA0n5itdwA4F+giTQ==","X-Received":"by 10.237.44.7 with SMTP id f7mr14645044qtd.118.1515379626919;\n\tSun, 07 Jan 2018 18:47:06 -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:46 -0300","Message-Id":"<20180108024558.17983-18-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 17/29] piix: move piix4 declaration into new\n\tsouthbridge/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>, Yongbok Kim <yongbok.kim@mips.com>, \n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>,\n\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/i386/pc.h                 |  2 --\n include/hw/southbridge/i82371_piix.h | 17 +++++++++++++++++\n hw/isa/piix4.c                       |  1 +\n hw/mips/gt64xxx_pci.c                |  1 +\n MAINTAINERS                          |  1 +\n 5 files changed, 20 insertions(+), 2 deletions(-)\n create mode 100644 include/hw/southbridge/i82371_piix.h","diff":"diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h\nindex d2b67e44a7..195c02febe 100644\n--- a/include/hw/i386/pc.h\n+++ b/include/hw/i386/pc.h\n@@ -272,8 +272,6 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type,\n                     MemoryRegion *ram_memory);\n \n PCIBus *find_i440fx(void);\n-/* piix4.c */\n-extern PCIDevice *piix4_dev;\n \n /* pc_sysfw.c */\n void pc_system_firmware_init(MemoryRegion *rom_memory,\ndiff --git a/include/hw/southbridge/i82371_piix.h b/include/hw/southbridge/i82371_piix.h\nnew file mode 100644\nindex 0000000000..95ac25becd\n--- /dev/null\n+++ b/include/hw/southbridge/i82371_piix.h\n@@ -0,0 +1,17 @@\n+/*\n+ * Intel 82371 PIIX South Bridge Emulation\n+ *\n+ * Copyright (c) 2018 Philippe Mathieu-Daudé\n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or later.\n+ * See the COPYING file in the top-level directory.\n+ */\n+#ifndef HW_ISA_PIIX_H\n+#define HW_ISA_PIIX_H\n+\n+#include \"hw/pci/pci.h\"\n+\n+/* piix4.c */\n+extern PCIDevice *piix4_dev;\n+\n+#endif /* HW_ISA_PIIX_H */\ndiff --git a/hw/isa/piix4.c b/hw/isa/piix4.c\nindex c19aa5a74f..b0f6a0a342 100644\n--- a/hw/isa/piix4.c\n+++ b/hw/isa/piix4.c\n@@ -28,6 +28,7 @@\n #include \"hw/i386/pc.h\"\n #include \"hw/pci/pci.h\"\n #include \"hw/isa/isa.h\"\n+#include \"hw/southbridge/i82371_piix.h\"\n #include \"hw/sysbus.h\"\n \n PCIDevice *piix4_dev;\ndiff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c\nindex 5a9dad9aae..24cc4044d7 100644\n--- a/hw/mips/gt64xxx_pci.c\n+++ b/hw/mips/gt64xxx_pci.c\n@@ -28,6 +28,7 @@\n #include \"hw/pci/pci.h\"\n #include \"hw/pci/pci_host.h\"\n #include \"hw/i386/pc.h\"\n+#include \"hw/southbridge/i82371_piix.h\"\n #include \"exec/address-spaces.h\"\n \n //#define DEBUG\ndiff --git a/MAINTAINERS b/MAINTAINERS\nindex 6f867da743..cead15b69b 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -888,6 +888,7 @@ F: include/hw/dma/i8257.h\n F: include/hw/i2c/pm_smbus.h\n F: include/hw/isa/superio.h\n F: include/hw/input/i8042.h\n+F: include/hw/southbridge/i82371_piix.h\n F: include/hw/timer/hpet.h\n F: include/hw/timer/i8254*\n F: include/hw/timer/mc146818rtc*\n","prefixes":["17/29"]}