From 139fb637d6616417f132389d2d068be2ed28cebb Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 19 Feb 2018 00:52:39 -0500 Subject: [PATCH] sparc: 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. Backports commit db5ebe5f411833b0ce4b6fa86ee00366e32d3968 from qemu --- qemu/target-sparc/cc_helper.c | 1 + qemu/target-sparc/cpu.c | 1 + qemu/target-sparc/fop_helper.c | 1 + qemu/target-sparc/helper.c | 1 + qemu/target-sparc/int32_helper.c | 2 +- qemu/target-sparc/int64_helper.c | 2 +- qemu/target-sparc/ldst_helper.c | 1 + qemu/target-sparc/translate.c | 7 +------ qemu/target-sparc/vis_helper.c | 1 + qemu/target-sparc/win_helper.c | 1 + 10 files changed, 10 insertions(+), 8 deletions(-) diff --git a/qemu/target-sparc/cc_helper.c b/qemu/target-sparc/cc_helper.c index 69823b70..0e7cc944 100644 --- a/qemu/target-sparc/cc_helper.c +++ b/qemu/target-sparc/cc_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" diff --git a/qemu/target-sparc/cpu.c b/qemu/target-sparc/cpu.c index d487a2a9..7f2fe173 100644 --- a/qemu/target-sparc/cpu.c +++ b/qemu/target-sparc/cpu.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "hw/sparc/sparc.h" diff --git a/qemu/target-sparc/fop_helper.c b/qemu/target-sparc/fop_helper.c index ee4592ef..08306436 100644 --- a/qemu/target-sparc/fop_helper.c +++ b/qemu/target-sparc/fop_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" diff --git a/qemu/target-sparc/helper.c b/qemu/target-sparc/helper.c index 8f60d0ae..8a926a4a 100644 --- a/qemu/target-sparc/helper.c +++ b/qemu/target-sparc/helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" diff --git a/qemu/target-sparc/int32_helper.c b/qemu/target-sparc/int32_helper.c index 4a34a710..e59d7dd3 100644 --- a/qemu/target-sparc/int32_helper.c +++ b/qemu/target-sparc/int32_helper.c @@ -17,10 +17,10 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "sysemu/sysemu.h" - void sparc_cpu_do_interrupt(CPUState *cs) { SPARCCPU *cpu = SPARC_CPU(cs->uc, cs); diff --git a/qemu/target-sparc/int64_helper.c b/qemu/target-sparc/int64_helper.c index 7eba49c3..f9879329 100644 --- a/qemu/target-sparc/int64_helper.c +++ b/qemu/target-sparc/int64_helper.c @@ -17,10 +17,10 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" - void sparc_cpu_do_interrupt(CPUState *cs) { SPARCCPU *cpu = SPARC_CPU(cs->uc, cs); diff --git a/qemu/target-sparc/ldst_helper.c b/qemu/target-sparc/ldst_helper.c index 94f75d02..36adb801 100644 --- a/qemu/target-sparc/ldst_helper.c +++ b/qemu/target-sparc/ldst_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" diff --git a/qemu/target-sparc/translate.c b/qemu/target-sparc/translate.c index c43bd661..a9bb0fb8 100644 --- a/qemu/target-sparc/translate.c +++ b/qemu/target-sparc/translate.c @@ -18,19 +18,14 @@ License along with this library; if not, see . */ -#include -#include -#include -#include +#include "qemu/osdep.h" #include "unicorn/platform.h" #include "cpu.h" #include "exec/helper-proto.h" #include "tcg-op.h" #include "exec/cpu_ldst.h" - #include "exec/helper-gen.h" - #include "exec/gen-icount.h" #define DYNAMIC_PC 1 /* dynamic pc value */ diff --git a/qemu/target-sparc/vis_helper.c b/qemu/target-sparc/vis_helper.c index 45fc7dbe..8a9b763d 100644 --- a/qemu/target-sparc/vis_helper.c +++ b/qemu/target-sparc/vis_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" diff --git a/qemu/target-sparc/win_helper.c b/qemu/target-sparc/win_helper.c index ccdd909e..c4fa4c96 100644 --- a/qemu/target-sparc/win_helper.c +++ b/qemu/target-sparc/win_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h"