exec: 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>
Message-id: 1453832250-766-4-git-send-email-peter.maydell@linaro.org

diff --git a/cpu-exec-common.c b/cpu-exec-common.c
index 43edf3677753d8dac7562abe2c59123624a27c19..1b1731cd83057e35a234637cbc7a9a4f38e66482 100644 (file)
--- a/cpu-exec-common.c
+++ b/cpu-exec-common.c
@@ -17,7 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "sysemu/cpus.h"
 #include "exec/memory-internal.h"

diff --git a/cpu-exec.c b/cpu-exec.c
index c88d0ffdcdb619422999bbfb6c91215f953c087f..c4593646ff24363b8033f92cf521fdc1fa2a3859 100644 (file)
--- a/cpu-exec.c
+++ b/cpu-exec.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 "cpu.h"
 #include "trace.h"
 #include "disas/disas.h"

diff --git a/cpus.c b/cpus.c
index 1e97cc4821a4a2ab6ff501c1fb9726b139510b0c..882b61851a44bb14da261bffc6d1ddfc6f3819c0 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -23,7 +23,7 @@
  */
 
 /* Needed early for CONFIG_BSD etc. */
-#include "config-host.h"
+#include "qemu/osdep.h"
 
 #include "monitor/monitor.h"
 #include "qapi/qmp/qerror.h"

diff --git a/cputlb.c b/cputlb.c
index f6fb161d153b2a958c60471bc4027c8adfb23545..3973030161d41d6679238c4a6c37b9ac5f898deb 100644 (file)
--- a/cputlb.c
+++ b/cputlb.c
@@ -17,7 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "exec/memory.h"

diff --git a/exec.c b/exec.c
index 7115403e05e2cdac5826274ba6c3eac64edb66fc..9e076bc323eace5ee85b4561f86042d73356489b 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -16,9 +16,8 @@
  * 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"
 #ifndef _WIN32
-#include <sys/types.h>
 #include <sys/mman.h>
 #endif
 
@@ -30,7 +29,6 @@
 #include "hw/boards.h"
 #endif
 #include "hw/qdev.h"
-#include "qemu/osdep.h"
 #include "sysemu/kvm.h"
 #include "sysemu/sysemu.h"
 #include "hw/xen/xen.h"

diff --git a/translate-all.c b/translate-all.c
index 042a8576ac5336325c2940350037b02599e15327..ab61fac66c52c697c53ee13a7277344431e4cf6f 100644 (file)
--- a/translate-all.c
+++ b/translate-all.c
@@ -19,16 +19,10 @@
 #ifdef _WIN32
 #include <windows.h>
 #else
-#include <sys/types.h>
 #include <sys/mman.h>
 #endif
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
-#include "config.h"
 
 #include "qemu-common.h"
 #define NO_CPU_IO_DEFS
@@ -43,7 +37,6 @@
 #if __FreeBSD_version >= 700104
 #define HAVE_KINFO_GETVMMAP
 #define sigqueue sigqueue_freebsd  /* avoid redefinition */
-#include <sys/time.h>
 #include <sys/proc.h>
 #include <machine/profile.h>
 #define _KERNEL

diff --git a/translate-common.c b/translate-common.c
index 171222d03722d37f1558546a2b45889872add3b4..ffbfe856c5ba7e5b6e30a10f5c331e867fa17879 100644 (file)
--- a/translate-common.c
+++ b/translate-common.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qom/cpu.h"