stubs: 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>
Message-id: 1454089805-5470-3-git-send-email-peter.maydell@linaro.org

diff --git a/stubs/arch-query-cpu-def.c b/stubs/arch-query-cpu-def.c
index a975ab453a3785482db158b451f088238436416a..cefe4beb82529a76ef88438ef210c55ba95660cd 100644 (file)
--- a/stubs/arch-query-cpu-def.c
+++ b/stubs/arch-query-cpu-def.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/arch_init.h"
 #include "qapi/qmp/qerror.h"

diff --git a/stubs/bdrv-commit-all.c b/stubs/bdrv-commit-all.c
index a8e0a95417ccede84f093f1b920d3a60a43fd7aa..bf84a1d85a737d1fcadad0ec1409e8b0cd4f7a3a 100644 (file)
--- a/stubs/bdrv-commit-all.c
+++ b/stubs/bdrv-commit-all.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block.h"
 

diff --git a/stubs/clock-warp.c b/stubs/clock-warp.c
index 5565118d11e9d6adc5d47614e0c0f76aac10a5ab..5ae32b9e6afff367174f70fe8f395ce5e7677e90 100644 (file)
--- a/stubs/clock-warp.c
+++ b/stubs/clock-warp.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 

diff --git a/stubs/cpu-get-clock.c b/stubs/cpu-get-clock.c
index 5b34c976d9d87e7a0bc24557ebd393e9a948a4a7..1d07523b86d0d3a0b24209a7669d0380e495e3c9 100644 (file)
--- a/stubs/cpu-get-clock.c
+++ b/stubs/cpu-get-clock.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 

diff --git a/stubs/cpu-get-icount.c b/stubs/cpu-get-icount.c
index d68585965fd7ff390068090951925fa39b65c8ed..3a6f2ab00f5c247d046deeba5ca313a3baf3b7b1 100644 (file)
--- a/stubs/cpu-get-icount.c
+++ b/stubs/cpu-get-icount.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 

diff --git a/stubs/cpus.c b/stubs/cpus.c
index 8e6f06b1168b3dc9ad052bddeae6556335fd91f5..e19272297ac33b26f32aa4097c107f24c4cd8942 100644 (file)
--- a/stubs/cpus.c
+++ b/stubs/cpus.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qom/cpu.h"
 

diff --git a/stubs/dump.c b/stubs/dump.c
index 8c24eda847b9e5b194438ffb73967107abaa111b..d9ee23f1eb6eae427aa59a1b2920f5cc416655ba 100644 (file)
--- a/stubs/dump.c
+++ b/stubs/dump.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/dump-arch.h"
 #include "qmp-commands.h"

diff --git a/stubs/fd-register.c b/stubs/fd-register.c
index d0c34fd2a3cb78f6124cca6c0696f59fe65239ae..f91aa34185365f2b501058b204db2505287f150c 100644 (file)
--- a/stubs/fd-register.c
+++ b/stubs/fd-register.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/main-loop.h"
 

diff --git a/stubs/fdset-add-fd.c b/stubs/fdset-add-fd.c
index ee1643708c294fa6f313a9876761af0671ca87e3..bf9e60aed502a8bafc3d00f88d8611b4603cf2fc 100644 (file)
--- a/stubs/fdset-add-fd.c
+++ b/stubs/fdset-add-fd.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 

diff --git a/stubs/fdset-find-fd.c b/stubs/fdset-find-fd.c
index 4f18344bad9eb66e15daf020454e8c54e53cbda4..1d9caf37ecc63120862e7d567907e80f7b31488c 100644 (file)
--- a/stubs/fdset-find-fd.c
+++ b/stubs/fdset-find-fd.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 

diff --git a/stubs/fdset-get-fd.c b/stubs/fdset-get-fd.c
index 7112c155e3921384602bf6b69c8cf3be361f688f..5325044b5a53df6840802a72eb89c61bd1e172d9 100644 (file)
--- a/stubs/fdset-get-fd.c
+++ b/stubs/fdset-get-fd.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 

diff --git a/stubs/fdset-remove-fd.c b/stubs/fdset-remove-fd.c
index 7f6d61e61924b439f1c27784db96e213e5facf7b..47ea297210ee2e4c632eb02abc193f2e9e04a684 100644 (file)
--- a/stubs/fdset-remove-fd.c
+++ b/stubs/fdset-remove-fd.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 

diff --git a/stubs/gdbstub.c b/stubs/gdbstub.c
index f6a4553a310a0760682c16d5ac18a8dc092d424b..359c28990a3e1f5a177575c19b8c75861990de4d 100644 (file)
--- a/stubs/gdbstub.c
+++ b/stubs/gdbstub.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "stdbool.h"            /* bool (in exec/gdbstub.h) */
 #include "stddef.h"             /* NULL */
 #include "exec/gdbstub.h"       /* xml_builtin */

diff --git a/stubs/get-fd.c b/stubs/get-fd.c
index 9f2c65cf0a523f0eef387e2a43f739d012106e66..85881fb678e4247dea0a616d1e39520275254a88 100644 (file)
--- a/stubs/get-fd.c
+++ b/stubs/get-fd.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 

diff --git a/stubs/get-next-serial.c b/stubs/get-next-serial.c
index 40c56d13d7156cf07f8db869126a18f62561bff4..6ff6a6d3b28db6d426fac489287e908afd7dd063 100644 (file)
--- a/stubs/get-next-serial.c
+++ b/stubs/get-next-serial.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 
 CharDriverState *serial_hds[0];

diff --git a/stubs/get-vm-name.c b/stubs/get-vm-name.c
index e5f619ffab5e8d51e24647cf44dba8926cd66e28..fa990136b068d0cff44da95ac11f46084b267009 100644 (file)
--- a/stubs/get-vm-name.c
+++ b/stubs/get-vm-name.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 
 const char *qemu_get_vm_name(void)

diff --git a/stubs/iothread-lock.c b/stubs/iothread-lock.c
index dda6f6b58dcb72342b6fc824dd943ada1ce35f48..9b6db2e74044363b10fb4189c372539dde661ecc 100644 (file)
--- a/stubs/iothread-lock.c
+++ b/stubs/iothread-lock.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/main-loop.h"
 

diff --git a/stubs/is-daemonized.c b/stubs/is-daemonized.c
index c0ee9171a72d78dc5ef5f16eb7baf40c9020a74b..d5cd1dc371343787b40f0a731940f54a7af49a6e 100644 (file)
--- a/stubs/is-daemonized.c
+++ b/stubs/is-daemonized.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 
 /* Win32 has its own inline stub */

diff --git a/stubs/kvm.c b/stubs/kvm.c
index 828b824f2ccf30f6b1e949bcb6b6779d5ecc7a79..ddd620499d14e19748c250f93361d6e32b76ba40 100644 (file)
--- a/stubs/kvm.c
+++ b/stubs/kvm.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/kvm.h"
 

diff --git a/stubs/machine-init-done.c b/stubs/machine-init-done.c
index 28a92555b60ee081c8bb54ff80940e43fd42b413..9a0d62514fb40f9acd5244ed6250622d05a5701c 100644 (file)
--- a/stubs/machine-init-done.c
+++ b/stubs/machine-init-done.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"
 

diff --git a/stubs/migr-blocker.c b/stubs/migr-blocker.c
index 300df6e205ada75898a70a45ea68e298662fcfb2..8ab3604dfa67c86835150aac807d6f4600134ed6 100644 (file)
--- a/stubs/migr-blocker.c
+++ b/stubs/migr-blocker.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "migration/migration.h"
 

diff --git a/stubs/mon-is-qmp.c b/stubs/mon-is-qmp.c
index dd26f19c877608ea8ea8d016ca9a21b4a7c3b150..a8344ced80fba35e6d4d95dad48f8b5376af79ae 100644 (file)
--- a/stubs/mon-is-qmp.c
+++ b/stubs/mon-is-qmp.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 

diff --git a/stubs/mon-printf.c b/stubs/mon-printf.c
index 0ce2ca69253c0d96e7726c912c86e37dbc1eb965..e7c1e0cf748dfd66add897fb027f7b91e8bfb38f 100644 (file)
--- a/stubs/mon-printf.c
+++ b/stubs/mon-printf.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 

diff --git a/stubs/monitor-init.c b/stubs/monitor-init.c
index 563902b4120c7dc6718e2ca814206ba418ba5b43..de1bc7cd54856d687dcc82ee6aedd803c9551c7c 100644 (file)
--- a/stubs/monitor-init.c
+++ b/stubs/monitor-init.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 

diff --git a/stubs/notify-event.c b/stubs/notify-event.c
index 32f7289d3a7315fbc24d9166efb6a14bd1b30b7d..14e52268a856d06bf6040f4d6fecae02264825cf 100644 (file)
--- a/stubs/notify-event.c
+++ b/stubs/notify-event.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/main-loop.h"
 

diff --git a/stubs/qmp_pc_dimm_device_list.c b/stubs/qmp_pc_dimm_device_list.c
index b584bd8b24feead3592375813f7191ddc753097f..a4af7fe473bd891bdc79cc4dfb835abdb2475b92 100644 (file)
--- a/stubs/qmp_pc_dimm_device_list.c
+++ b/stubs/qmp_pc_dimm_device_list.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qom/object.h"
 #include "hw/mem/pc-dimm.h"
 

diff --git a/stubs/qtest.c b/stubs/qtest.c
index 4dfde6104d3bfd9416a292dfc03a347ba16abaae..891eb954fbeead7ce295c39ad34bd88a75f0d3d4 100644 (file)
--- a/stubs/qtest.c
+++ b/stubs/qtest.c
@@ -8,6 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/qtest.h"
 
 /* Needed for qtest_allowed() */

diff --git a/stubs/replay-user.c b/stubs/replay-user.c
index cf330721c88098931105a851743d2c66684a67d1..b29e7ebba15beea0df6d6e363d4b91795c931378 100644 (file)
--- a/stubs/replay-user.c
+++ b/stubs/replay-user.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/replay.h"
 
 bool replay_exception(void)

diff --git a/stubs/replay.c b/stubs/replay.c
index 8f98790257d1d8a61d3bd458e2683477b009305e..00ca01f55a5fe1e14d690fe311995514870d05d6 100644 (file)
--- a/stubs/replay.c
+++ b/stubs/replay.c
@@ -1,5 +1,5 @@
+#include "qemu/osdep.h"
 #include "sysemu/replay.h"
-#include <stdlib.h>
 #include "sysemu/sysemu.h"
 
 ReplayMode replay_mode;

diff --git a/stubs/reset.c b/stubs/reset.c
index ad287251ed4adafa8c3839a42cd44be29a6c97b7..5d47711f9ac065103ed744b2e6350e28ce5dea5a 100644 (file)
--- a/stubs/reset.c
+++ b/stubs/reset.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 
 /* Stub functions for binaries that never call qemu_devices_reset(),

diff --git a/stubs/runstate-check.c b/stubs/runstate-check.c
index bd2e3757ae1413260e56e88ea175eba71b9f6d56..7c5227e8489453447ff6934898b5c0f8a76270f6 100644 (file)
--- a/stubs/runstate-check.c
+++ b/stubs/runstate-check.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 
 bool runstate_check(RunState state)

diff --git a/stubs/set-fd-handler.c b/stubs/set-fd-handler.c
index a8481bc3c1453bb78e5a2a751708bcdae754d72d..26965de4c36fb0875070a3a8f03827464f151141 100644 (file)
--- a/stubs/set-fd-handler.c
+++ b/stubs/set-fd-handler.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/main-loop.h"
 

diff --git a/stubs/slirp.c b/stubs/slirp.c
index bd0ac7f27de4374c447f983cea8ebd2209e20fff..dcae51f0e5c3e64f6ddeb31b8eda997072e1444a 100644 (file)
--- a/stubs/slirp.c
+++ b/stubs/slirp.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "slirp/slirp.h"
 

diff --git a/stubs/sysbus.c b/stubs/sysbus.c
index e13496582b3a487d468f0c3fdc635fda9695bdcf..d8da90caae527457863c60cffec041f1e90d9aaa 100644 (file)
--- a/stubs/sysbus.c
+++ b/stubs/sysbus.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/qdev-core.h"
 
 BusState *sysbus_get_default(void)

diff --git a/stubs/target-get-monitor-def.c b/stubs/target-get-monitor-def.c
index 711a9ae46b9d27eac7e44ce2e0f11cd4cff59a8b..013e6571e5f371e7ed996982a0867ed4f314a00c 100644 (file)
--- a/stubs/target-get-monitor-def.c
+++ b/stubs/target-get-monitor-def.c
@@ -19,6 +19,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "stdint.h"
 
 typedef struct CPUState CPUState;

diff --git a/stubs/target-monitor-defs.c b/stubs/target-monitor-defs.c
index 7d8d182b2343e054c5ce6cc41986825f525ae43c..203ebb0f2731bfb3ffdcec1cecc71838bce2d389 100644 (file)
--- a/stubs/target-monitor-defs.c
+++ b/stubs/target-monitor-defs.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "stddef.h"
 #include "qemu/typedefs.h"
 

diff --git a/stubs/uuid.c b/stubs/uuid.c
index ffc0ed40aec1abe795bf85031151b25deb631102..92ad71783100c983d23091f25ec45887934c8f6c 100644 (file)
--- a/stubs/uuid.c
+++ b/stubs/uuid.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"
 #include "qmp-commands.h"

diff --git a/stubs/vhost.c b/stubs/vhost.c
index d346b856f57f964922b370f1415399e29b599fc6..2d76cdebdc5b481ea95647d581a206c4fac47b35 100644 (file)
--- a/stubs/vhost.c
+++ b/stubs/vhost.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/virtio/vhost.h"
 
 bool vhost_has_free_slot(void)

diff --git a/stubs/vm-stop.c b/stubs/vm-stop.c
index 69fd86b2e82e0b96add2fe76efdb56323a1beeda..8271cad65d54cc53406f9784f8f7de0f2cd0e1d0 100644 (file)
--- a/stubs/vm-stop.c
+++ b/stubs/vm-stop.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"
 

diff --git a/stubs/vmstate.c b/stubs/vmstate.c
index 778bc3fc698b5b8552461473f5f9d983cec56f1e..65906271d254ce788952aaf08ef3a11f991a640d 100644 (file)
--- a/stubs/vmstate.c
+++ b/stubs/vmstate.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"