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 <[email protected]> Message-id: [email protected]
raininggibs · Feb 4, 2016 · 87c9b5e · 87c9b5e
1 parent e16f4c8
commit 87c9b5e
Show file tree

Hide file tree

Showing 40 changed files with 40 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
      *
      */
+    #include "qemu/osdep.h"
     #include "sysemu/replay.h"
     bool replay_exception(void)
@@ Expand Down @@