[03/37] exec: Clean up includes

Commit Message

Peter Maydell Jan. 26, 2016, 6:16 p.m. UTC

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 <[e-mail]>
---
 cpu-exec-common.c  | 2 +-
 cpu-exec.c         | 2 +-
 cpus.c             | 2 +-
 cputlb.c           | 2 +-
 exec.c             | 4 +---
 translate-all.c    | 9 +--------
 translate-common.c | 1 +
 7 files changed, 7 insertions(+), 15 deletions(-)

Patch

diff --git a/cpu-exec-common.c b/cpu-exec-common.c
index 43edf36..1b1731c 100644
--- 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 c88d0ff..c459364 100644
--- 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 3efff6b..d42e8ed 100644
--- 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 f6fb161..3973030 100644
--- 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 7115403..9e076bc 100644
--- 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 042a857..ab61fac 100644
--- 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 171222d..ffbfe85 100644
--- 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"