From db5ebe5f411833b0ce4b6fa86ee00366e32d3968 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 26 Jan 2016 18:16:59 +0000 Subject: 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. Signed-off-by: Peter Maydell Message-id: 1453832250-766-7-git-send-email-peter.maydell@linaro.org --- hw/char/grlib_apbuart.c | 1 + hw/intc/grlib_irqmp.c | 1 + hw/sparc/leon3.c | 1 + hw/sparc/sun4m.c | 1 + hw/sparc64/sun4u.c | 1 + hw/timer/grlib_gptimer.c | 1 + target-sparc/cc_helper.c | 1 + target-sparc/cpu.c | 1 + target-sparc/fop_helper.c | 1 + target-sparc/gdbstub.c | 2 +- target-sparc/helper.c | 1 + target-sparc/int32_helper.c | 1 + target-sparc/int64_helper.c | 1 + target-sparc/ldst_helper.c | 1 + target-sparc/machine.c | 1 + target-sparc/mmu_helper.c | 1 + target-sparc/monitor.c | 1 + target-sparc/translate.c | 6 +----- target-sparc/vis_helper.c | 1 + target-sparc/win_helper.c | 1 + 20 files changed, 20 insertions(+), 6 deletions(-) diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index 35ef661771..871524c82f 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/sysbus.h" #include "sysemu/char.h" diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c index d1813f76b6..f5ca8f752b 100644 --- a/hw/intc/grlib_irqmp.c +++ b/hw/intc/grlib_irqmp.c @@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/sysbus.h" #include "cpu.h" diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 22d1e7e31b..07c5c850ef 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "qemu/timer.h" #include "hw/ptimer.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 230dac955b..1fcec4478f 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/error-report.h" #include "qemu/timer.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 861727f7e3..124c376897 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci-host/apb.h" diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index d655bb2a27..dd000f5afa 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/ptimer.h" diff --git a/target-sparc/cc_helper.c b/target-sparc/cc_helper.c index 35dab73216..44c4409346 100644 --- a/target-sparc/cc_helper.c +++ b/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/target-sparc/cpu.c b/target-sparc/cpu.c index c197a0f48a..ce903f8dfd 100644 --- a/target-sparc/cpu.c +++ b/target-sparc/cpu.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "qemu/error-report.h" diff --git a/target-sparc/fop_helper.c b/target-sparc/fop_helper.c index ee4592ef2b..08306436ac 100644 --- a/target-sparc/fop_helper.c +++ b/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/target-sparc/gdbstub.c b/target-sparc/gdbstub.c index 3de3242b29..e530dc52f5 100644 --- a/target-sparc/gdbstub.c +++ b/target-sparc/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 . */ -#include "config.h" +#include "qemu/osdep.h" #include "qemu-common.h" #include "exec/gdbstub.h" diff --git a/target-sparc/helper.c b/target-sparc/helper.c index 6600834d4a..8349cbe2cc 100644 --- a/target-sparc/helper.c +++ b/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/target-sparc/int32_helper.c b/target-sparc/int32_helper.c index 7c380ba2a1..d4d6a4b8a5 100644 --- a/target-sparc/int32_helper.c +++ b/target-sparc/int32_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "trace.h" #include "sysemu/sysemu.h" diff --git a/target-sparc/int64_helper.c b/target-sparc/int64_helper.c index b02d22b199..ddef66b569 100644 --- a/target-sparc/int64_helper.c +++ b/target-sparc/int64_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 "trace.h" diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index c7ad47d35c..b0600fd24d 100644 --- a/target-sparc/ldst_helper.c +++ b/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/target-sparc/machine.c b/target-sparc/machine.c index aecbe2cedb..1046016f3a 100644 --- a/target-sparc/machine.c +++ b/target-sparc/machine.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/boards.h" #include "qemu/timer.h" diff --git a/target-sparc/mmu_helper.c b/target-sparc/mmu_helper.c index 7495406b3e..aa80c4829b 100644 --- a/target-sparc/mmu_helper.c +++ b/target-sparc/mmu_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "trace.h" #include "exec/address-spaces.h" diff --git a/target-sparc/monitor.c b/target-sparc/monitor.c index ca54d72d99..7cc1b0f87f 100644 --- a/target-sparc/monitor.c +++ b/target-sparc/monitor.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" #include "monitor/hmp-target.h" diff --git a/target-sparc/translate.c b/target-sparc/translate.c index f99ceed834..747f94d60e 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -18,11 +18,7 @@ License along with this library; if not, see . */ -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include "cpu.h" #include "disas/disas.h" diff --git a/target-sparc/vis_helper.c b/target-sparc/vis_helper.c index 45fc7dbe81..8a9b763d0b 100644 --- a/target-sparc/vis_helper.c +++ b/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/target-sparc/win_helper.c b/target-sparc/win_helper.c index 5b6d7b5ae3..a8a6c0cfc4 100644 --- a/target-sparc/win_helper.c +++ b/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" #include "trace.h" -- cgit v1.2.3