From patchwork Mon Dec 7 16:23:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 57802 Delivered-To: patches@linaro.org Received: by 10.112.147.194 with SMTP id tm2csp1251065lbb; Mon, 7 Dec 2015 08:23:48 -0800 (PST) X-Received: by 10.25.150.72 with SMTP id y69mr14386813lfd.91.1449505428394; Mon, 07 Dec 2015 08:23:48 -0800 (PST) Return-Path: Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id e91si16551963lfi.99.2015.12.07.08.23.48 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 07 Dec 2015 08:23:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1a5yZl-0008L5-An; Mon, 07 Dec 2015 16:23:45 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paolo Bonzini , Markus Armbruster , "Daniel P. Berrange" Subject: [PATCH 2/3] target-arm: Clean up includes Date: Mon, 7 Dec 2015 16:23:44 +0000 Message-Id: <1449505425-32022-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1449505425-32022-1-git-send-email-peter.maydell@linaro.org> References: <1449505425-32022-1-git-send-email-peter.maydell@linaro.org> 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 --- 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(-) -- 1.9.1 diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c index d7cff3d..76c33b9 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 30739fc..72cb65f 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 63c8b1c..5f8a177 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 5d22838..3b6df3f 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 1c34396..08b91a4 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 8f3b8d1..634c6bc 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 deb8dbe..c46af93 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 afc4163..18d60ff 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 a506914..7d87e1a 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 db2edc2..38bf433 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 79ef4c6..c1c5584 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 df1e2b0..646ba41 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 ceebfeb..d409259 100644 --- a/target-arm/kvm64.c +++ b/target-arm/kvm64.c @@ -8,14 +8,12 @@ * */ -#include -#include +#include "qemu/osdep.h" #include #include #include -#include "config-host.h" #include "qemu-common.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/target-arm/machine.c b/target-arm/machine.c index 36a0d15..97cbfe3 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 47d13e9..1f1844f 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 6cd54c8..af5a783 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 20e4cb6..c55487f 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 14e8131..80f6c20 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 5d22879..48884ab 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"