[31/37] cris: 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]>
---
 disas/cris.c                | 1 +
 hw/cris/axis_dev88.c        | 1 +
 hw/cris/boot.c              | 1 +
 target-cris/cpu.c           | 1 +
 target-cris/gdbstub.c       | 2 +-
 target-cris/helper.c        | 1 +
 target-cris/machine.c       | 1 +
 target-cris/op_helper.c     | 1 +
 target-cris/translate.c     | 1 +
 target-cris/translate_v10.c | 1 +
 10 files changed, 10 insertions(+), 1 deletion(-)

Patch

diff --git a/disas/cris.c b/disas/cris.c
index 4482a41..7f35bc0 100644
--- a/disas/cris.c
+++ b/disas/cris.c
@@ -18,6 +18,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 "qemu-common.h"
 #include "disas/bfd.h"
 //#include "sysdep.h"
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index de880d1..f2ba1d0 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -22,6 +22,7 @@ 
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "hw/block/flash.h"
diff --git a/hw/cris/boot.c b/hw/cris/boot.c
index 1cfa339..6608160 100644
--- a/hw/cris/boot.c
+++ b/hw/cris/boot.c
@@ -22,6 +22,7 @@ 
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/loader.h"
 #include "elf.h"
diff --git a/target-cris/cpu.c b/target-cris/cpu.c
index 8eaf5a5..b2c8624 100644
--- a/target-cris/cpu.c
+++ b/target-cris/cpu.c
@@ -21,6 +21,7 @@ 
  * <http://www.gnu.org/licenses/lgpl-2.1.html>
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "mmu.h"
diff --git a/target-cris/gdbstub.c b/target-cris/gdbstub.c
index 5db3683..1bbf17b 100644
--- a/target-cris/gdbstub.c
+++ b/target-cris/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-cris/helper.c b/target-cris/helper.c
index df6c9fd..1eb9fd9 100644
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -18,6 +18,7 @@ 
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "mmu.h"
 #include "qemu/host-utils.h"
diff --git a/target-cris/machine.c b/target-cris/machine.c
index 983b67c..9cc2820 100644
--- a/target-cris/machine.c
+++ b/target-cris/machine.c
@@ -18,6 +18,7 @@ 
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 
 static const VMStateDescription vmstate_tlbset = {
diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index 2296677..320f2b8 100644
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -18,6 +18,7 @@ 
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "mmu.h"
 #include "exec/helper-proto.h"
diff --git a/target-cris/translate.c b/target-cris/translate.c
index 2429931..295005f 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -23,6 +23,7 @@ 
  * The condition code translation is in need of attention.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
 #include "tcg-op.h"
diff --git a/target-cris/translate_v10.c b/target-cris/translate_v10.c
index df20bdc..1335517 100644
--- a/target-cris/translate_v10.c
+++ b/target-cris/translate_v10.c
@@ -18,6 +18,7 @@ 
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "crisv10-decode.h"
 
 static const char *regnames_v10[] =