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 <peter.maydell@linaro.org>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
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 02ac80b650ad395542a215e8d8c3d69862eae622..7d4ff8120a817c2cf1cc2f6eaaa9f7dc862b3bff 100644 (file)
--- 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 b014c7f5228876f5cd2f675827a5424ed96f6902..45997ff4ae77eb4e6f2bba70bf1e6b1dc932c57b 100644 (file)
--- a/hw/char/sclpconsole.c
+++ b/hw/char/sclpconsole.c
@@ -12,6 +12,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <hw/qdev.h>
 #include "qemu/thread.h"
 #include "qemu/error-report.h"

diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index e83bf60a744bc624042a4b048dc9bed0edb5f632..c29068b30d494ef321ea11d98b0db6a881e0025f 100644 (file)
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -9,6 +9,7 @@
  * directory.
  */
 
+#include "qemu/osdep.h"
 #include <hw/qdev.h>
 #include "qemu/bitops.h"
 #include "exec/address-spaces.h"

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 907b48560c2dbebad0afe7846dc1c9d56323c544..85be24d3da6e7134ad581a2f75926f7e1de8907b 100644 (file)
--- 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 9c01be5ca943c27e5fe11ad40d5dd3ad52bdcb62..6992add8d367eb14fd1f05ab94d07eabf18e760c 100644 (file)
--- 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 132588b758dbb3790502e85079155f24f2ff1262..5d6cebb6e8c85f04aacd4b816703e1d5d31cc8ba 100644 (file)
--- 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 <hw/pci/pci_bus.h>
 #include <hw/pci/msi.h>

diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 1a6a3e781de7ddc79373351d5c613f968ae082aa..fe73ca881937860a35b82aa80415508decd57b30 100644 (file)
--- 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 <exec/memory-internal.h>

diff --git a/hw/s390x/s390-skeys-kvm.c b/hw/s390x/s390-skeys-kvm.c
index eaa37ba40880835d1d34dce58f930eeaaac5f79e..131da56bbe3f083794a38e78a6288123c79849a0 100644 (file)
--- 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 0cd340747d3b92017f4392165c042b618286f0d7..6528ffed17f2f42e5f096914b0227fc745a9bf48 100644 (file)
--- 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 586ddbb39a0adcea00b212a4252ecc491965aa98..89f5d0d6a68fdc0d83aebf5465a5afb81108820c 100644 (file)
--- 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 c7bdc2005d36f5082e09dcc2aa15dceb3c019622..23d67d61704423f241134606b2eae83d73324438 100644 (file)
--- 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 946325f9fe0dcf63fec6809aebdc503bfe3a7495..9efb9c6c484b487eac2381b1903e1e686de071f1 100644 (file)
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -21,6 +21,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#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 23dee88dd96dc1a3c9e694952cbcf67707e59499..c8cc732163507582ad0d499a31602ece098bbb12 100644 (file)
--- 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 322eb31d958184a48048d021c040c8a5247e8b6e..b1f3ef8c7d8e5979641b589017917cb2106d71aa 100644 (file)
--- 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 15b06e108bf244ba1d1e712e4714f4b1b8a4caca..c0ecab9c3ba5bba5d947d2b87ac68814a213e6c3 100644 (file)
--- 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 <hw/qdev.h>
 #include "sysemu/sysemu.h"
 #include "hw/s390x/sclp.h"

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 95a6c142b8a5cf4eb8016be2a652d840d1cff48d..74b9e2e22b80e0593e510b36deae9a81912aafa8 100644 (file)
--- 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 ddda723906252948b23fbc6c85255aea84444052..5eb5b94e4302dd6a343abee0533b087e5e18969f 100644 (file)
--- 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 549a99b357e3f818f50e716c338648da492d0c69..4731869f6b1bceb1bca9de9c73c00787308e2655 100644 (file)
--- 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 c4ee00268f668f7e5a28f33d4b1299cc7a20baee..0d9411bdf3e5f5383bc7910577ae3b7dc9b0da6a 100644 (file)
--- a/target-s390x/cc_helper.c
+++ b/target-s390x/cc_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 "exec/helper-proto.h"
 #include "qemu/host-utils.h"

diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index 792310e50d339322ba718c8e0650e37350197d74..73a910d2faebd103c814ff2fd034cbaa586f8d55 100644 (file)
--- 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 45b7ddfbe3c1a539a3bf00baef84af3dfe58d1d9..1c7f67354286ff1fd6290bc85279c9bd868a94d8 100644 (file)
--- a/target-s390x/fpu_helper.c
+++ b/target-s390x/fpu_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 "exec/cpu_ldst.h"
 #include "exec/helper-proto.h"

diff --git a/target-s390x/gdbstub.c b/target-s390x/gdbstub.c
index a05d1cd7aba6848eaf22e674e67e186399654376..9fc36cb54e40da290230ec44b44baecabc2d7220 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
-#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 1231e586a474a43f96bf0c242857fc47144d1b2a..838bdd9e9ef8376d81958efa714424bfcf64e553 100644 (file)
--- a/target-s390x/helper.c
+++ b/target-s390x/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 "exec/gdbstub.h"
 #include "qemu/timer.h"

diff --git a/target-s390x/int_helper.c b/target-s390x/int_helper.c
index a46c736d67bc66388225c60a3059850955d014a7..cc1071eeaf90dfaa66a6b843a03ae7d671c74eed 100644 (file)
--- a/target-s390x/int_helper.c
+++ b/target-s390x/int_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 "qemu/host-utils.h"
 #include "exec/helper-proto.h"

diff --git a/target-s390x/interrupt.c b/target-s390x/interrupt.c
index 1404d0afdd75f535b8eaf5495ac5ce9f722c03f2..07d210acf7124838ccd90765efc5aad918c19b3f 100644 (file)
--- 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 9a8de6d12200c1ec385216c742e688f95efbe4a4..142ff9384472e3d26d33f9e7442be7c4ed3f9181 100644 (file)
--- a/target-s390x/ioinst.c
+++ b/target-s390x/ioinst.c
@@ -9,7 +9,7 @@
  * directory.
  */
 
-#include <sys/types.h>
+#include "qemu/osdep.h"
 
 #include "cpu.h"
 #include "ioinst.h"

diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index b8222ccd1749df41ae5c1937f3eacfa3160d7b7d..9b21b96da5d99f8c3ed74ae0dd167a1172b56618 100644 (file)
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -21,7 +21,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 

diff --git a/target-s390x/machine.c b/target-s390x/machine.c
index 96ad0a9d4f83066247991266dbc381e819b279e8..6b2609054b0586893b1e2ce3b024fc040eb76dfc 100644 (file)
--- 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 90399f1b0b351a696dfd18d13e0b1eb9e239d5a0..707862203019dacc8738b282ea901aa4579355e1 100644 (file)
--- a/target-s390x/mem_helper.c
+++ b/target-s390x/mem_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 "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"

diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index dab02d3c2bb6be8acef2fa91e90f01e1f9e34503..71cbe34e05be8fbdcb459994dfbef9fb8d8832ec 100644 (file)
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -18,11 +18,11 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/memory.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
-#include <string.h>
 #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 f4e1872b42a0787eef2953ffac13518a44f51598..5323c53541bd9fce303a1038fa1bec7a5e3b6aa9 100644 (file)
--- 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 c79a2cb57a9e095b28aaa0c6c0441ed9e2fe3670..811928b1c3eaaae2930b0e19018d5d74ce137270 100644 (file)
--- 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"