From: Peter Maydell Date: Tue, 26 Jan 2016 18:17:00 +0000 (+0000) Subject: s390: Clean up includes X-Git-Tag: v2.6.0-rc0~191 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9615495afc84a8bac0652caeedb2ce4e671e8a94;p=thirdparty%2Fqemu.git s390: 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 Acked-by: Cornelia Huck Message-id: 1453832250-766-8-git-send-email-peter.maydell@linaro.org --- diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index 02ac80b650a..7d4ff8120a8 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -13,6 +13,7 @@ * */ +#include "qemu/osdep.h" #include "hw/qdev.h" #include "qemu/thread.h" #include "qemu/error-report.h" diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index b014c7f5228..45997ff4ae7 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -12,6 +12,7 @@ * */ +#include "qemu/osdep.h" #include #include "qemu/thread.h" #include "qemu/error-report.h" diff --git a/hw/s390x/css.c b/hw/s390x/css.c index e83bf60a744..c29068b30d4 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -9,6 +9,7 @@ * directory. */ +#include "qemu/osdep.h" #include #include "qemu/bitops.h" #include "exec/address-spaces.h" diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 907b48560c2..85be24d3da6 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -15,6 +15,7 @@ * */ +#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 9c01be5ca94..6992add8d36 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "cpu.h" #include "elf.h" diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 132588b758d..5d6cebb6e8c 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -11,6 +11,7 @@ * directory. */ +#include "qemu/osdep.h" #include "s390-pci-bus.h" #include #include diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 1a6a3e781de..fe73ca88193 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -11,6 +11,7 @@ * directory. */ +#include "qemu/osdep.h" #include "s390-pci-inst.h" #include "s390-pci-bus.h" #include diff --git a/hw/s390x/s390-skeys-kvm.c b/hw/s390x/s390-skeys-kvm.c index eaa37ba4088..131da56bbe3 100644 --- a/hw/s390x/s390-skeys-kvm.c +++ b/hw/s390x/s390-skeys-kvm.c @@ -9,6 +9,7 @@ * directory. */ +#include "qemu/osdep.h" #include "hw/s390x/storage-keys.h" #include "sysemu/kvm.h" #include "qemu/error-report.h" diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 0cd340747d3..6528ffed17f 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -9,6 +9,7 @@ * directory. */ +#include "qemu/osdep.h" #include "hw/boards.h" #include "qmp-commands.h" #include "migration/qemu-file.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 586ddbb39a0..89f5d0d6a68 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -9,6 +9,7 @@ * directory. */ +#include "qemu/osdep.h" #include "hw/boards.h" #include "exec/address-spaces.h" #include "s390-virtio.h" diff --git a/hw/s390x/s390-virtio-hcall.c b/hw/s390x/s390-virtio-hcall.c index c7bdc2005d3..23d67d61704 100644 --- a/hw/s390x/s390-virtio-hcall.c +++ b/hw/s390x/s390-virtio-hcall.c @@ -9,6 +9,7 @@ * directory. */ +#include "qemu/osdep.h" #include "cpu.h" #include "hw/s390x/s390-virtio.h" diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 946325f9fe0..9efb9c6c484 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -21,6 +21,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 23dee88dd96..c8cc7321635 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -12,6 +12,7 @@ * */ +#include "qemu/osdep.h" #include "cpu.h" #include "sysemu/kvm.h" #include "exec/memory.h" diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c index 322eb31d958..b1f3ef8c7d8 100644 --- a/hw/s390x/sclpcpu.c +++ b/hw/s390x/sclpcpu.c @@ -12,6 +12,7 @@ * option) any later version. See the COPYING file in the top-level directory. * */ +#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" #include "hw/s390x/event-facility.h" diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c index 15b06e108bf..c0ecab9c3ba 100644 --- a/hw/s390x/sclpquiesce.c +++ b/hw/s390x/sclpquiesce.c @@ -11,6 +11,7 @@ * option) any later version. See the COPYING file in the top-level directory. * */ +#include "qemu/osdep.h" #include #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 95a6c142b8a..74b9e2e22b8 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -10,6 +10,7 @@ * directory. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c index ddda7239062..5eb5b94e430 100644 --- a/hw/watchdog/wdt_diag288.c +++ b/hw/watchdog/wdt_diag288.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "sysemu/watchdog.h" #include "hw/sysbus.h" #include "qemu/timer.h" diff --git a/target-s390x/arch_dump.c b/target-s390x/arch_dump.c index 549a99b357e..4731869f6b1 100644 --- a/target-s390x/arch_dump.c +++ b/target-s390x/arch_dump.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "cpu.h" #include "elf.h" #include "exec/cpu-all.h" diff --git a/target-s390x/cc_helper.c b/target-s390x/cc_helper.c index c4ee00268f6..0d9411bdf3e 100644 --- a/target-s390x/cc_helper.c +++ b/target-s390x/cc_helper.c @@ -18,6 +18,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 792310e50d3..73a910d2fae 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -23,6 +23,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "cpu.h" #include "qemu-common.h" #include "qemu/timer.h" diff --git a/target-s390x/fpu_helper.c b/target-s390x/fpu_helper.c index 45b7ddfbe3c..1c7f6735428 100644 --- a/target-s390x/fpu_helper.c +++ b/target-s390x/fpu_helper.c @@ -18,6 +18,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" diff --git a/target-s390x/gdbstub.c b/target-s390x/gdbstub.c index a05d1cd7aba..9fc36cb54e4 100644 --- a/target-s390x/gdbstub.c +++ b/target-s390x/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" #include "qemu/bitops.h" diff --git a/target-s390x/helper.c b/target-s390x/helper.c index 1231e586a47..838bdd9e9ef 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -18,6 +18,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/gdbstub.h" #include "qemu/timer.h" diff --git a/target-s390x/int_helper.c b/target-s390x/int_helper.c index a46c736d67b..cc1071eeaf9 100644 --- a/target-s390x/int_helper.c +++ b/target-s390x/int_helper.c @@ -18,6 +18,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-s390x/interrupt.c b/target-s390x/interrupt.c index 1404d0afdd7..07d210acf71 100644 --- a/target-s390x/interrupt.c +++ b/target-s390x/interrupt.c @@ -7,6 +7,7 @@ * option) any later version. See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "cpu.h" #include "sysemu/kvm.h" diff --git a/target-s390x/ioinst.c b/target-s390x/ioinst.c index 9a8de6d1220..142ff938447 100644 --- a/target-s390x/ioinst.c +++ b/target-s390x/ioinst.c @@ -9,7 +9,7 @@ * directory. */ -#include +#include "qemu/osdep.h" #include "cpu.h" #include "ioinst.h" diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index b8222ccd174..9b21b96da5d 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -21,7 +21,7 @@ * License along with this library; if not, see . */ -#include +#include "qemu/osdep.h" #include #include diff --git a/target-s390x/machine.c b/target-s390x/machine.c index 96ad0a9d4f8..6b2609054b0 100644 --- a/target-s390x/machine.c +++ b/target-s390x/machine.c @@ -14,6 +14,7 @@ * or (at your option) any later version. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "cpu.h" #include "sysemu/kvm.h" diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index 90399f1b0b3..70786220301 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -18,6 +18,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-s390x/misc_helper.c b/target-s390x/misc_helper.c index dab02d3c2bb..71cbe34e05b 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -18,11 +18,11 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/memory.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" -#include #include "sysemu/kvm.h" #include "qemu/timer.h" #include "exec/address-spaces.h" diff --git a/target-s390x/mmu_helper.c b/target-s390x/mmu_helper.c index f4e1872b42a..5323c53541b 100644 --- a/target-s390x/mmu_helper.c +++ b/target-s390x/mmu_helper.c @@ -15,6 +15,7 @@ * GNU General Public License for more details. */ +#include "qemu/osdep.h" #include "qemu/error-report.h" #include "exec/address-spaces.h" #include "cpu.h" diff --git a/target-s390x/translate.c b/target-s390x/translate.c index c79a2cb57a9..811928b1c3e 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -28,6 +28,7 @@ # define LOG_DISAS(...) do { } while (0) #endif +#include "qemu/osdep.h" #include "cpu.h" #include "disas/disas.h" #include "tcg-op.h"