This patchset runs clean-includes on a bunch more files. With this (plus one or two patches I sent earlier) every file in the tree except for those in tests/ has been updated. (I skipped tests/ for now because at least some of the files in tests/tcg seem to be totally standalone. I'll look at those next week but I thought I'd send out this set first.)
One or two files might have slipped through the net if they were newly added since I did the scan; we can pick those up later though. thanks -- PMM Peter Maydell (15): ui: Clean up includes stubs: Clean up includes bsd-user: Clean up includes backends: Clean up includes util: Clean up includes disas: Clean up includes qapi: Clean up includes qga: Clean up includes slirp: Clean up includes net: Clean up includes qobject: Clean up includes qom: Clean up includes io: Clean up includes contrib: Clean up includes all: Clean up includes accel.c | 1 + aio-posix.c | 1 + aio-win32.c | 1 + arch_init.c | 2 +- async.c | 1 + backends/baum.c | 1 + backends/hostmem-file.c | 1 + backends/hostmem-ram.c | 1 + backends/hostmem.c | 1 + backends/msmouse.c | 2 +- backends/rng-egd.c | 1 + backends/rng-random.c | 1 + backends/rng.c | 1 + backends/testdev.c | 1 + backends/tpm.c | 1 + balloon.c | 1 + block.c | 4 +--- blockdev-nbd.c | 1 + blockdev.c | 1 + blockjob.c | 2 +- bootdevice.c | 1 + bsd-user/bsdload.c | 8 +------- bsd-user/elfload.c | 8 +------- bsd-user/main.c | 8 +------- bsd-user/mmap.c | 7 +------ bsd-user/signal.c | 7 +------ bsd-user/strace.c | 6 +----- bsd-user/syscall.c | 12 +----------- bsd-user/uaccess.c | 3 +-- bt-host.c | 2 +- bt-vhci.c | 1 + contrib/ivshmem-client/ivshmem-client.c | 2 +- contrib/ivshmem-client/main.c | 1 + contrib/ivshmem-server/ivshmem-server.c | 2 +- contrib/ivshmem-server/main.c | 1 + device-hotplug.c | 1 + device_tree.c | 7 +------ disas.c | 3 +-- disas/hppa.c | 1 + disas/i386.c | 2 +- disas/ia64.c | 3 +-- disas/m68k.c | 3 +-- disas/s390.c | 1 + disas/sparc.c | 2 +- disas/tci.c | 1 + dma-helpers.c | 1 + dump.c | 2 +- fpu/softfloat.c | 3 +-- gdbstub.c | 9 +-------- hmp.c | 1 + io/channel-buffer.c | 1 + io/channel-command.c | 1 + io/channel-file.c | 1 + io/channel-socket.c | 1 + io/channel-tls.c | 1 + io/channel-watch.c | 1 + io/channel-websock.c | 1 + io/channel.c | 1 + io/task.c | 1 + iohandler.c | 2 +- ioport.c | 1 + iothread.c | 1 + kvm-all.c | 3 +-- kvm-stub.c | 1 + main-loop.c | 1 + memory.c | 2 +- memory_mapping.c | 1 + module-common.c | 2 +- monitor.c | 2 +- nbd/client.c | 1 + nbd/common.c | 1 + nbd/server.c | 1 + net/checksum.c | 1 + net/dump.c | 1 + net/eth.c | 1 + net/filter-buffer.c | 1 + net/filter.c | 1 + net/hub.c | 1 + net/l2tpv3.c | 2 +- net/net.c | 2 +- net/netmap.c | 3 +-- net/queue.c | 1 + net/slirp.c | 2 +- net/socket.c | 2 +- net/tap-aix.c | 2 +- net/tap-bsd.c | 1 + net/tap-haiku.c | 2 +- net/tap-linux.c | 1 + net/tap-solaris.c | 2 +- net/tap-win32.c | 2 +- net/tap.c | 3 +-- net/util.c | 3 +-- net/vde.c | 2 +- net/vhost-user.c | 1 + numa.c | 1 + os-posix.c | 6 +----- os-win32.c | 7 +------ page_cache.c | 8 +------- qapi/opts-visitor.c | 1 + qapi/qapi-dealloc-visitor.c | 1 + qapi/qapi-util.c | 2 +- qapi/qapi-visit-core.c | 1 + qapi/qmp-dispatch.c | 2 +- qapi/qmp-event.c | 2 +- qapi/qmp-input-visitor.c | 1 + qapi/qmp-output-visitor.c | 1 + qapi/qmp-registry.c | 2 +- qapi/string-input-visitor.c | 1 + qapi/string-output-visitor.c | 1 + qdev-monitor.c | 1 + qemu-bridge-helper.c | 13 ++----------- qemu-char.c | 8 +------- qemu-log.c | 1 + qemu-nbd.c | 5 +---- qemu-seccomp.c | 2 +- qemu-timer.c | 1 + qga/channel-posix.c | 7 +------ qga/channel-win32.c | 5 +---- qga/commands-posix.c | 9 +-------- qga/commands-win32.c | 3 +-- qga/commands.c | 1 + qga/guest-agent-command-state.c | 1 + qga/main.c | 5 +---- qga/service-win32.c | 3 +-- qga/vss-win32.c | 2 +- qjson.c | 2 +- qmp.c | 1 + qobject/json-lexer.c | 2 +- qobject/json-parser.c | 2 +- qobject/json-streamer.c | 1 + qobject/qbool.c | 1 + qobject/qdict.c | 1 + qobject/qfloat.c | 1 + qobject/qint.c | 1 + qobject/qjson.c | 1 + qobject/qlist.c | 1 + qobject/qnull.c | 1 + qobject/qobject.c | 1 + qobject/qstring.c | 1 + qom/container.c | 2 +- qom/object.c | 1 + qom/object_interfaces.c | 1 + qom/qom-qobject.c | 1 + qtest.c | 1 + replay/replay-events.c | 1 + replay/replay-input.c | 1 + replay/replay-internal.c | 1 + replay/replay-time.c | 1 + replay/replay.c | 1 + slirp/arp_table.c | 1 + slirp/bootp.c | 1 + slirp/cksum.c | 1 + slirp/dnssearch.c | 4 +--- slirp/if.c | 1 + slirp/ip_icmp.c | 1 + slirp/ip_input.c | 1 + slirp/ip_output.c | 1 + slirp/mbuf.c | 1 + slirp/misc.c | 1 + slirp/sbuf.c | 1 + slirp/slirp.c | 1 + slirp/socket.c | 1 + slirp/tcp_input.c | 1 + slirp/tcp_output.c | 1 + slirp/tcp_subr.c | 1 + slirp/tcp_timer.c | 1 + slirp/tftp.c | 1 + slirp/udp.c | 1 + spice-qemu-char.c | 3 +-- stubs/arch-query-cpu-def.c | 1 + stubs/bdrv-commit-all.c | 1 + stubs/clock-warp.c | 1 + stubs/cpu-get-clock.c | 1 + stubs/cpu-get-icount.c | 1 + stubs/cpus.c | 1 + stubs/dump.c | 1 + stubs/fd-register.c | 1 + stubs/fdset-add-fd.c | 1 + stubs/fdset-find-fd.c | 1 + stubs/fdset-get-fd.c | 1 + stubs/fdset-remove-fd.c | 1 + stubs/gdbstub.c | 1 + stubs/get-fd.c | 1 + stubs/get-next-serial.c | 1 + stubs/get-vm-name.c | 1 + stubs/iothread-lock.c | 1 + stubs/is-daemonized.c | 1 + stubs/kvm.c | 1 + stubs/machine-init-done.c | 1 + stubs/migr-blocker.c | 1 + stubs/mon-is-qmp.c | 1 + stubs/mon-printf.c | 1 + stubs/monitor-init.c | 1 + stubs/notify-event.c | 1 + stubs/qmp_pc_dimm_device_list.c | 1 + stubs/qtest.c | 1 + stubs/replay-user.c | 1 + stubs/replay.c | 2 +- stubs/reset.c | 1 + stubs/runstate-check.c | 1 + stubs/set-fd-handler.c | 1 + stubs/slirp.c | 1 + stubs/sysbus.c | 1 + stubs/target-get-monitor-def.c | 1 + stubs/target-monitor-defs.c | 1 + stubs/uuid.c | 1 + stubs/vhost.c | 1 + stubs/vm-stop.c | 1 + stubs/vmstate.c | 1 + tcg-runtime.c | 2 +- tci.c | 2 +- thread-pool.c | 2 +- thunk.c | 4 +--- tpm.c | 2 +- trace/control.c | 1 + trace/ftrace.c | 5 +---- trace/qmp.c | 1 + trace/simple.c | 6 +----- ui/console-gl.c | 1 + ui/console.c | 1 + ui/curses.c | 1 + ui/cursor.c | 1 + ui/egl-context.c | 1 + ui/egl-helpers.c | 9 +-------- ui/gtk-egl.c | 1 + ui/gtk-gl-area.c | 1 + ui/gtk.c | 1 + ui/input-keymap.c | 1 + ui/input-legacy.c | 2 +- ui/input.c | 1 + ui/keymaps.c | 1 + ui/qemu-pixman.c | 1 + ui/sdl.c | 1 + ui/sdl2-2d.c | 1 + ui/sdl2-gl.c | 1 + ui/sdl2-input.c | 1 + ui/sdl2.c | 1 + ui/sdl_zoom.c | 4 +--- ui/shader.c | 1 + ui/spice-core.c | 1 + ui/spice-display.c | 1 + ui/spice-input.c | 5 +---- ui/vnc-auth-sasl.c | 1 + ui/vnc-auth-vencrypt.c | 1 + ui/vnc-enc-hextile.c | 1 + ui/vnc-enc-tight.c | 3 +-- ui/vnc-enc-zlib.c | 1 + ui/vnc-enc-zrle-template.c | 2 +- ui/vnc-enc-zrle.c | 1 + ui/vnc-enc-zywrle-template.c | 1 + ui/vnc-jobs.c | 1 + ui/vnc-palette.c | 2 +- ui/vnc-ws.c | 1 + ui/vnc.c | 2 +- ui/x_keymap.c | 1 + user-exec.c | 3 +-- util/acl.c | 1 + util/base64.c | 1 + util/bitmap.c | 1 + util/bitops.c | 1 + util/buffer.c | 1 + util/compatfd.c | 1 + util/coroutine-gthread.c | 1 + util/coroutine-sigaltstack.c | 4 +--- util/coroutine-ucontext.c | 3 +-- util/coroutine-win32.c | 1 + util/crc32c.c | 1 + util/cutils.c | 3 +-- util/envlist.c | 1 + util/error.c | 2 +- util/event_notifier-posix.c | 1 + util/event_notifier-win32.c | 1 + util/fifo8.c | 1 + util/getauxval.c | 2 +- util/hbitmap.c | 4 +--- util/hexdump.c | 1 + util/host-utils.c | 3 +-- util/id.c | 1 + util/iov.c | 1 + util/mmap-alloc.c | 3 +-- util/module.c | 2 +- util/notify.c | 1 + util/osdep.c | 11 +---------- util/oslib-posix.c | 4 +--- util/oslib-win32.c | 3 +-- util/path.c | 7 +------ util/qemu-config.c | 2 +- util/qemu-coroutine-io.c | 1 + util/qemu-coroutine-lock.c | 1 + util/qemu-coroutine-sleep.c | 1 + util/qemu-coroutine.c | 1 + util/qemu-error.c | 2 +- util/qemu-openpty.c | 2 +- util/qemu-option.c | 4 +--- util/qemu-progress.c | 3 +-- util/qemu-sockets.c | 7 +------ util/qemu-thread-posix.c | 11 +---------- util/qemu-thread-win32.c | 3 +-- util/qemu-timer-common.c | 1 + util/rcu.c | 6 +----- util/readline.c | 1 + util/rfifolock.c | 2 +- util/throttle.c | 1 + util/timed-average.c | 2 +- util/unicode.c | 1 + util/uri.c | 3 +-- vl.c | 9 +-------- 307 files changed, 308 insertions(+), 308 deletions(-) -- 1.9.1