From patchwork Thu May 2 18:58:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1094512 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44w4N35pY8z9s9N for ; Fri, 3 May 2019 05:00:35 +1000 (AEST) Received: from localhost ([127.0.0.1]:57323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGwb-0003lU-JK for incoming@patchwork.ozlabs.org; Thu, 02 May 2019 15:00:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvk-0003jW-1J for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvh-00034P-Ve for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:39 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:54335) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvg-00033d-0R; Thu, 02 May 2019 14:59:37 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MQ5f4-1h97kp1GwC-00M0HN; Thu, 02 May 2019 20:58:51 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:26 +0200 Message-Id: <20190502185835.15185-5-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:xVhJC29hi64K8Mo9KwgOZ8dLwMyyjb7cCfI8WpjTj+J/1NYL+Qm Voo0cOPqv1EUxVYbM/VRS/Bs7RZpK3EZ/gMsUB9Xs9FPXlvA3pRs6HIds7fO3wjVeuqGDTP Omc5HWKWoTNY1g/NWXMbPA5arCrFvmZTB+nPplx+kdp6xiOKd7NqRMNL5XYEUBAFzHHM3d9 gQ0hK8lqpVG4jHiVusFXw== X-UI-Out-Filterresults: notjunk:1; V03:K0:oSm8HSqA+gY=:XwAhgy9L85c3CyL1iSZyyX jELqtg/xXpnnrP7tz/BHAUkvE8vAW9qMQW2v1pR0mBRwh1stHyIDKGSGEmIkRgeD6wwitjVBm dG0A4asqc4Be4g50w7cZhnBXlTFVXLfY5IbTCbpDT71fCquvcYRFCF9wz2/19AB4vQL9qCIJ7 +M2qX6VELbnfO3OgaJ4hMd2z1YJXJ8F4lrQmP/NWUolETkIMEN8Axav1SaW+L/xbnAMcslN/k SKPP3m6o1Zo1XC8qYFFH03lknOQouvxzRC1TpGq2DMy3jU9gsRfriXpTqXFVpJBodsjui2+aB xfotr5NB9Y9Rcm29m78XyqDqHOWLCKFjUI/81ClbJa2M1qxo1DUYixdvLyE03J0kzr4HBWS99 weAkaD3yYhxJ7IBjGi6K20doj1OjBq85Fa8d6g5oV1hIvK6EOXRwbixH12LHgg3B+1p3Bqhgb Tau0Em0K26WqaMIBIQsSY4JvUKMIPU5TK9jhL+DH9y6OMd0qfAajYi2Lx2ODObEClbyXHqRlW Qs82h7We6fASG4AxxR8QfW0CoRPNHmEUmd5Zma7nUZwy6jX010wz872KOhF7TggtWYGzX+CTJ x1Vlj9AbEykJDPky2FX0fRU9g/lfxb4Yg2EAdYRFU/YYN7TihCwwwxH7g/kr2aDkvXA+/etk7 2EQrc3roOKCej5/qlQKbhC3eHOliLMUo3IrMCmkR+zaE2npgw8+HB+wniP9oYLd8mvlSxk+R6 i2hjXVCCZdO/9aAR7HBqshv0lp0zY42mYXdbmA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 04/13] Clean up includes 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: Peter Maydell , Jason Wang , Michael Tokarev , Markus Armbruster , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Paolo Bonzini , =?utf-8?q?Andreas_F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Markus Armbruster Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes, with the changes to the following files manually reverted: contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c slirp/src/* target/s390x/gen-features.c tests/migration/s390x/a-b-bios.c tests/test-rcu-simpleq.c tests/test-rcu-tailq.c tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c We're in the process of spinning out slirp/. tests/uefi-test-tools/ is guest software. The remaining reverts are the same as in commit b7d89466dde. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Thomas Huth Message-Id: <20190313162812.8885-1-armbru@redhat.com> Signed-off-by: Laurent Vivier --- hw/display/ati_int.h | 1 - include/hw/cpu/cluster.h | 1 - tests/fp/platform.h | 1 - tests/libqos/qgraph.h | 4 ---- contrib/elf2dmp/main.c | 3 +-- contrib/elf2dmp/pdb.c | 3 +-- hw/display/ati.c | 1 + hw/display/ati_2d.c | 1 + hw/display/ati_dbg.c | 1 + tests/qos-test.c | 2 +- 10 files changed, 6 insertions(+), 12 deletions(-) diff --git a/hw/display/ati_int.h b/hw/display/ati_int.h index a6f3e20e6319..2f426064cf7d 100644 --- a/hw/display/ati_int.h +++ b/hw/display/ati_int.h @@ -9,7 +9,6 @@ #ifndef ATI_INT_H #define ATI_INT_H -#include "qemu/osdep.h" #include "hw/pci/pci.h" #include "vga_int.h" diff --git a/include/hw/cpu/cluster.h b/include/hw/cpu/cluster.h index 549c2d31d438..01c1e50cd221 100644 --- a/include/hw/cpu/cluster.h +++ b/include/hw/cpu/cluster.h @@ -20,7 +20,6 @@ #ifndef HW_CPU_CLUSTER_H #define HW_CPU_CLUSTER_H -#include "qemu/osdep.h" #include "hw/qdev.h" /* diff --git a/tests/fp/platform.h b/tests/fp/platform.h index c20ba70baa07..f8c423dde3dc 100644 --- a/tests/fp/platform.h +++ b/tests/fp/platform.h @@ -29,7 +29,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config-host.h" #ifndef HOST_WORDS_BIGENDIAN #define LITTLEENDIAN 1 diff --git a/tests/libqos/qgraph.h b/tests/libqos/qgraph.h index ef0c73837a60..e799095b308a 100644 --- a/tests/libqos/qgraph.h +++ b/tests/libqos/qgraph.h @@ -19,11 +19,7 @@ #ifndef QGRAPH_H #define QGRAPH_H -#include -#include -#include #include -#include #include "qemu/module.h" #include "malloc.h" diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c index 1bfeb89ba7bd..9a2dbc290214 100644 --- a/contrib/elf2dmp/main.c +++ b/contrib/elf2dmp/main.c @@ -5,9 +5,8 @@ * */ -#include - #include "qemu/osdep.h" + #include "err.h" #include "addrspace.h" #include "pe.h" diff --git a/contrib/elf2dmp/pdb.c b/contrib/elf2dmp/pdb.c index 64af20f5842e..a5bd40c99dca 100644 --- a/contrib/elf2dmp/pdb.c +++ b/contrib/elf2dmp/pdb.c @@ -18,9 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include - #include "qemu/osdep.h" + #include "pdb.h" #include "err.h" diff --git a/hw/display/ati.c b/hw/display/ati.c index db409be3c958..75716dd944ec 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -16,6 +16,7 @@ * No 3D at all yet (maybe after 2D works, but feel free to improve it) */ +#include "qemu/osdep.h" #include "ati_int.h" #include "ati_regs.h" #include "vga_regs.h" diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index bc98ba6eebf6..f31b3c27c7d8 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -7,6 +7,7 @@ * This work is licensed under the GNU GPL license version 2 or later. */ +#include "qemu/osdep.h" #include "ati_int.h" #include "ati_regs.h" #include "qemu/log.h" diff --git a/hw/display/ati_dbg.c b/hw/display/ati_dbg.c index 1e6c32624e5a..b045f81d0602 100644 --- a/hw/display/ati_dbg.c +++ b/hw/display/ati_dbg.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "ati_int.h" #ifdef DEBUG_ATI diff --git a/tests/qos-test.c b/tests/qos-test.c index 6b1145ecccff..ae2fb5de1c9b 100644 --- a/tests/qos-test.c +++ b/tests/qos-test.c @@ -16,8 +16,8 @@ * License along with this library; if not, see */ -#include #include "qemu/osdep.h" +#include #include "libqtest.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qbool.h"