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 <peter.maydell@linaro.org>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1449505425-32022-3-git-send-email-peter.maydell@linaro.org

diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c
index d7cff3db23fb3accc003946e7b5cc2932857401f..76c33b97e7f8bd482e49b5f89c4fb6148d283c7c 100644 (file)
--- a/target-arm/arm-semi.c
+++ b/target-arm/arm-semi.c
@@ -18,13 +18,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
+#include "qemu/osdep.h"
 
 #include "cpu.h"
 #include "exec/semihost.h"

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 450ef78a3d653dc07b6b9c5502cbc11060bde5bb..3f5f8e8cb505787d84c8a211f7fb7b765cb36565 100644 (file)
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -18,6 +18,7 @@
  * <http://www.gnu.org/licenses/gpl-2.0.html>
  */
 
+#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 63c8b1cfa9b54badc94f9fc9fe1474ae55d9186c..5f8a1774757b776de09636def33c49aa35c0bf16 100644 (file)
--- a/target-arm/cpu64.c
+++ b/target-arm/cpu64.c
@@ -18,6 +18,7 @@
  * <http://www.gnu.org/licenses/gpl-2.0.html>
  */
 
+#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 5d228380659225f4d9ab9b226f2b3c1a5e0695bc..3b6df3f41a424f2f9d55ad1dc69b84f4aa34eb66 100644 (file)
--- 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 <stdlib.h>
+#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 1c3439654f1bf5606cc29d1d9063e7f540811dd1..08b91a48616ae1acd6075dac2f34d46c4990d324 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
-#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 8f3b8d1778202dd8d8f9266c1626b4a60ca6e370..634c6bc6f27807a5e27078a4f41a971c587ecea7 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
-#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 fc3ccdf2a774a977785d33e8fc70a5b28bb06c71..01f3958b90412d652611138e186bd02d692df206 100644 (file)
--- a/target-arm/helper-a64.c
+++ b/target-arm/helper-a64.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#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 faeaaa806ae7eb55f3f6169983ad60e3a850909e..f956b67dedaed14ffa5e65ce2089c5fd44b91a15 100644 (file)
--- 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 a5069144d19adfc76541d4100294e1e3e1dd2b19..7d87e1a0a8af212c3201bcc740847e18623a18d9 100644 (file)
--- a/target-arm/iwmmxt_helper.c
+++ b/target-arm/iwmmxt_helper.c
@@ -19,8 +19,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
+#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 db2edc2c4cc5fd6cc7323e3c4391cc9bf8f1ad42..38bf4338767b160f237d68aa09d50d81ce09df05 100644 (file)
--- 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 eca3a0037deb5d10004037640c91b0e9554d9bbb..969ab0bab51760ddf29f7c7916ed36e5e935d4c2 100644 (file)
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -8,8 +8,7 @@
  *
  */
 
-#include <stdio.h>
-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 

diff --git a/target-arm/kvm32.c b/target-arm/kvm32.c
index ff83ce6757085f31619088887446fdd66fa28e20..ea01932a651e323b5c6eec858a6d7f72502e1d1e 100644 (file)
--- a/target-arm/kvm32.c
+++ b/target-arm/kvm32.c
@@ -8,8 +8,7 @@
  *
  */
 
-#include <stdio.h>
-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 

diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c
index bb9531f33c1e07b380bca37b562167b9ae8ba479..0f1b4d6a00342a4d70e0e2e1c237e9ef6f05e06f 100644 (file)
--- a/target-arm/kvm64.c
+++ b/target-arm/kvm64.c
@@ -9,8 +9,7 @@
  *
  */
 
-#include <stdio.h>
-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/ptrace.h>
@@ -18,7 +17,6 @@
 #include <linux/elf.h>
 #include <linux/kvm.h>
 
-#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 b1e1418a6e2f70bf68b5e2a1dab1dd4ba78d3cbe..ed1925ae3eea0ed27845d3749ad993af5dd3dcd1 100644 (file)
--- 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 47d13e908c12f3334e8ede90691e3d9efa4f7c08..1f1844f5b29e794851f93f938b9fc9b6fe8b5d3b 100644 (file)
--- 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 <stdlib.h>
-#include <stdio.h>
+#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 951fc5ae51c5d776d6894fcd8530a74f197f83bc..7b6b3fd97c80bb637f37278e3e45f6b722da00ce 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
+#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 20e4cb6f9c11a6ebfe79f78fdb222d17c24e0065..c55487f87221fa6929a32c8544a8607c9ff4e173 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
+#include "qemu/osdep.h"
 #include <cpu.h>
 #include <cpu-qom.h>
 #include <exec/helper-proto.h>

diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c
index 14e8131b0538aa39d9ecf6508ebdcd926cd408f3..80f6c2058c232d0354da8bbd99f41f2a05bc8634 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "cpu.h"
 #include "tcg-op.h"

diff --git a/target-arm/translate.c b/target-arm/translate.c
index d485e7d9c3b43d8bd633ff2057df7d921799fd39..cff511b9c65fb3bff491caed8dbcd63123d5aa65 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "cpu.h"
 #include "internals.h"