[08/37] unicore: Clean up includes

Commit Message

Peter Maydell Jan. 26, 2016, 6:17 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]>
---
 hw/dma/puv3_dma.c               | 1 +
 hw/gpio/puv3_gpio.c             | 1 +
 hw/intc/puv3_intc.c             | 1 +
 hw/misc/puv3_pm.c               | 1 +
 hw/timer/puv3_ost.c             | 1 +
 hw/unicore32/puv3.c             | 1 +
 target-unicore32/cpu.c          | 1 +
 target-unicore32/helper.c       | 1 +
 target-unicore32/op_helper.c    | 1 +
 target-unicore32/softmmu.c      | 1 +
 target-unicore32/translate.c    | 6 +-----
 target-unicore32/ucf64_helper.c | 1 +
 12 files changed, 12 insertions(+), 5 deletions(-)

Patch

diff --git a/hw/dma/puv3_dma.c b/hw/dma/puv3_dma.c
index 101bd7f..b97a6c1 100644
--- a/hw/dma/puv3_dma.c
+++ b/hw/dma/puv3_dma.c
@@ -8,6 +8,7 @@ 
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 
diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c
index 39840aa..445afcc 100644
--- a/hw/gpio/puv3_gpio.c
+++ b/hw/gpio/puv3_gpio.c
@@ -8,6 +8,7 @@ 
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 
diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c
index c2803d0..ef8488a 100644
--- a/hw/intc/puv3_intc.c
+++ b/hw/intc/puv3_intc.c
@@ -8,6 +8,7 @@ 
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 
 #undef DEBUG_PUV3
diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c
index 37f2369..577ceba 100644
--- a/hw/misc/puv3_pm.c
+++ b/hw/misc/puv3_pm.c
@@ -8,6 +8,7 @@ 
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 
diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c
index fa9eefd..93650b7 100644
--- a/hw/timer/puv3_ost.c
+++ b/hw/timer/puv3_ost.c
@@ -8,6 +8,7 @@ 
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"
 #include "qemu/main-loop.h"
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index 1968202..4522fa2 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -9,6 +9,7 @@ 
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "elf.h"
diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c
index e5252eb..c92ccc4 100644
--- a/target-unicore32/cpu.c
+++ b/target-unicore32/cpu.c
@@ -12,6 +12,7 @@ 
  * or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index ae63277..21f5f35 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -9,6 +9,7 @@ 
  * or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/gdbstub.h"
 #include "exec/helper-proto.h"
diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c
index 0266dbd..f584730 100644
--- a/target-unicore32/op_helper.c
+++ b/target-unicore32/op_helper.c
@@ -8,6 +8,7 @@ 
  * published by the Free Software Foundation, or (at your option) any
  * later version. See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"
diff --git a/target-unicore32/softmmu.c b/target-unicore32/softmmu.c
index 9a3786d..d267fed 100644
--- a/target-unicore32/softmmu.c
+++ b/target-unicore32/softmmu.c
@@ -12,6 +12,7 @@ 
 #error This file only exist under softmmu circumstance
 #endif
 
+#include "qemu/osdep.h"
 #include <cpu.h>
 
 #undef DEBUG_UC32
diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index d2f92f0..5db8f94 100644
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -8,11 +8,7 @@ 
  * published by the Free Software Foundation, or (at your option) any
  * later version. See the COPYING file in the top-level directory.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "cpu.h"
 #include "disas/disas.h"
diff --git a/target-unicore32/ucf64_helper.c b/target-unicore32/ucf64_helper.c
index 5af008f..6c91901 100644
--- a/target-unicore32/ucf64_helper.c
+++ b/target-unicore32/ucf64_helper.c
@@ -8,6 +8,7 @@ 
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"