From 74c21bd07491739c6e56bcb1f962e4df730e77f3 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 7 Dec 2015 16:23:44 +0000 Subject: [PATCH] target-arm: Clean up includes 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. Signed-off-by: Peter Maydell Reviewed-by: Daniel P. Berrange Message-id: 1449505425-32022-3-git-send-email-peter.maydell@linaro.org --- target-arm/arm-semi.c | 8 +------- target-arm/cpu.c | 1 + target-arm/cpu64.c | 1 + target-arm/crypto_helper.c | 2 +- target-arm/gdbstub.c | 2 +- target-arm/gdbstub64.c | 2 +- target-arm/helper-a64.c | 1 + target-arm/helper.c | 1 + target-arm/iwmmxt_helper.c | 3 +-- target-arm/kvm-stub.c | 1 + target-arm/kvm.c | 3 +-- target-arm/kvm32.c | 3 +-- target-arm/kvm64.c | 4 +--- target-arm/machine.c | 1 + target-arm/neon_helper.c | 3 +-- target-arm/op_helper.c | 1 + target-arm/psci.c | 1 + target-arm/translate-a64.c | 6 +----- target-arm/translate.c | 6 +----- 19 files changed, 19 insertions(+), 31 deletions(-) diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c index d7cff3db23..76c33b97e7 100644 --- a/target-arm/arm-semi.c +++ b/target-arm/arm-semi.c @@ -18,13 +18,7 @@ * along with this program; if not, see . */ -#include -#include -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include "cpu.h" #include "exec/semihost.h" diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 450ef78a3d..3f5f8e8cb5 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include "cpu.h" #include "internals.h" #include "qemu-common.h" diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c index 63c8b1cfa9..5f8a177475 100644 --- a/target-arm/cpu64.c +++ b/target-arm/cpu64.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include "cpu.h" #include "qemu-common.h" #if !defined(CONFIG_USER_ONLY) diff --git a/target-arm/crypto_helper.c b/target-arm/crypto_helper.c index 5d22838065..3b6df3f41a 100644 --- a/target-arm/crypto_helper.c +++ b/target-arm/crypto_helper.c @@ -9,7 +9,7 @@ * version 2 of the License, or (at your option) any later version. */ -#include +#include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" diff --git a/target-arm/gdbstub.c b/target-arm/gdbstub.c index 1c3439654f..08b91a4861 100644 --- a/target-arm/gdbstub.c +++ b/target-arm/gdbstub.c @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#include "config.h" +#include "qemu/osdep.h" #include "qemu-common.h" #include "exec/gdbstub.h" diff --git a/target-arm/gdbstub64.c b/target-arm/gdbstub64.c index 8f3b8d1778..634c6bc6f2 100644 --- a/target-arm/gdbstub64.c +++ b/target-arm/gdbstub64.c @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#include "config.h" +#include "qemu/osdep.h" #include "qemu-common.h" #include "exec/gdbstub.h" diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index fc3ccdf2a7..01f3958b90 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/gdbstub.h" #include "exec/helper-proto.h" diff --git a/target-arm/helper.c b/target-arm/helper.c index faeaaa806a..f956b67ded 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "cpu.h" #include "internals.h" #include "exec/gdbstub.h" diff --git a/target-arm/iwmmxt_helper.c b/target-arm/iwmmxt_helper.c index a5069144d1..7d87e1a0a8 100644 --- a/target-arm/iwmmxt_helper.c +++ b/target-arm/iwmmxt_helper.c @@ -19,8 +19,7 @@ * License along with this library; if not, see . */ -#include -#include +#include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" diff --git a/target-arm/kvm-stub.c b/target-arm/kvm-stub.c index db2edc2c4c..38bf433876 100644 --- a/target-arm/kvm-stub.c +++ b/target-arm/kvm-stub.c @@ -9,6 +9,7 @@ * See the COPYING file in the top-level directory. * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "kvm_arm.h" diff --git a/target-arm/kvm.c b/target-arm/kvm.c index eca3a0037d..969ab0bab5 100644 --- a/target-arm/kvm.c +++ b/target-arm/kvm.c @@ -8,8 +8,7 @@ * */ -#include -#include +#include "qemu/osdep.h" #include #include diff --git a/target-arm/kvm32.c b/target-arm/kvm32.c index ff83ce6757..ea01932a65 100644 --- a/target-arm/kvm32.c +++ b/target-arm/kvm32.c @@ -8,8 +8,7 @@ * */ -#include -#include +#include "qemu/osdep.h" #include #include diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c index bb9531f33c..0f1b4d6a00 100644 --- a/target-arm/kvm64.c +++ b/target-arm/kvm64.c @@ -9,8 +9,7 @@ * */ -#include -#include +#include "qemu/osdep.h" #include #include #include @@ -18,7 +17,6 @@ #include #include -#include "config-host.h" #include "qemu-common.h" #include "qemu/timer.h" #include "qemu/error-report.h" diff --git a/target-arm/machine.c b/target-arm/machine.c index b1e1418a6e..ed1925ae3e 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/boards.h" #include "qemu/error-report.h" diff --git a/target-arm/neon_helper.c b/target-arm/neon_helper.c index 47d13e908c..1f1844f5b2 100644 --- a/target-arm/neon_helper.c +++ b/target-arm/neon_helper.c @@ -6,8 +6,7 @@ * * This code is licensed under the GNU GPL v2. */ -#include -#include +#include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 951fc5ae51..7b6b3fd97c 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" #include "internals.h" diff --git a/target-arm/psci.c b/target-arm/psci.c index 20e4cb6f9c..c55487f872 100644 --- a/target-arm/psci.c +++ b/target-arm/psci.c @@ -15,6 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ +#include "qemu/osdep.h" #include #include #include diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 14e8131b05..80f6c2058c 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -16,11 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include "cpu.h" #include "tcg-op.h" diff --git a/target-arm/translate.c b/target-arm/translate.c index d485e7d9c3..cff511b9c6 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -18,11 +18,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include "cpu.h" #include "internals.h"