The "states" at this point are just header files with various stuff thrown in from sysemu.h, but structures could be introduced later, functions named more consistently and other header files examined.
The patches touch a lot of files, but most of the changes are just one line adjustments to #include directives. Blue Swirl (4): Introduce host state Introduce VM state Introduce machine state Remove sysemu.h acl.c | 1 - arch_init.c | 3 +- arm-semi.c | 1 - audio/audio.c | 2 +- audio/winwaveaudio.c | 1 - balloon.c | 1 - block/vdi.c | 1 - blockdev.c | 2 +- bt-host.c | 1 - bt-vhci.c | 1 - buffered_file.c | 1 - cpus.c | 3 +- cpus.h | 4 + device_tree.c | 1 - gdbstub.c | 2 +- host-state.h | 40 ++++++++ hw/acpi_piix4.c | 2 +- hw/an5206.c | 1 - hw/apb_pci.c | 2 +- hw/arm_boot.c | 2 +- hw/arm_sysctl.c | 2 +- hw/armv7m.c | 1 - hw/axis_dev88.c | 1 - hw/blizzard.c | 1 - hw/bonito.c | 2 +- hw/bt-hci-csr.c | 1 - hw/cbus.c | 2 +- hw/cris-boot.c | 1 - hw/cuda.c | 2 +- hw/dummy_m68k.c | 1 - hw/e1000.c | 2 +- hw/eepro100.c | 2 +- hw/etraxfs.c | 1 - hw/etraxfs_dma.c | 2 +- hw/etraxfs_timer.c | 2 +- hw/fdc.c | 2 +- hw/fw_cfg.c | 4 +- hw/gumstix.c | 1 - hw/ide/cmd646.c | 2 +- hw/ide/core.c | 3 +- hw/ide/ich.c | 1 - hw/ide/isa.c | 1 - hw/ide/macio.c | 1 - hw/ide/microdrive.c | 1 - hw/ide/mmio.c | 1 - hw/ide/pci.c | 1 - hw/ide/piix.c | 2 +- hw/ide/qdev.c | 2 +- hw/ide/via.c | 2 +- hw/integratorcp.c | 1 - hw/isa-bus.c | 1 - hw/kvmclock.c | 1 - hw/lan9118.c | 2 +- hw/leon3.c | 2 +- hw/lm32_boards.c | 1 - hw/lm32_sys.c | 2 +- hw/loader.c | 2 +- hw/m48t59.c | 2 +- hw/mac_nvram.c | 2 +- hw/mainstone.c | 1 - hw/mc146818rtc.c | 2 +- hw/mcf5206.c | 2 +- hw/mcf5208.c | 2 +- hw/mips_fulong2e.c | 2 +- hw/mips_jazz.c | 2 +- hw/mips_malta.c | 2 +- hw/mips_mipssim.c | 2 +- hw/mips_r4k.c | 2 +- hw/multiboot.c | 2 +- hw/musicpal.c | 2 +- hw/ne2000.c | 2 +- hw/nseries.c | 2 +- hw/omap1.c | 2 +- hw/omap2.c | 2 +- hw/omap_sx1.c | 1 - hw/palm.c | 2 +- hw/parallel.c | 2 +- hw/pc.c | 2 +- hw/pc_piix.c | 2 +- hw/pci-hotplug.c | 1 + hw/pci-stub.c | 2 +- hw/pci.c | 2 +- hw/pcie.c | 2 +- hw/pcie_aer.c | 2 +- hw/pckbd.c | 2 +- hw/pcnet.c | 2 +- hw/petalogix_ml605_mmu.c | 2 +- hw/petalogix_s3adsp1800_mmu.c | 1 - hw/ppc.c | 2 +- hw/ppc405_boards.c | 2 +- hw/ppc405_uc.c | 2 +- hw/ppc440.c | 2 +- hw/ppc440_bamboo.c | 1 - hw/ppc4xx_devs.c | 1 - hw/ppc_newworld.c | 2 +- hw/ppc_oldworld.c | 2 +- hw/ppc_prep.c | 2 +- hw/ppce500_mpc8544ds.c | 2 +- hw/pxa2xx.c | 2 +- hw/pxa2xx_lcd.c | 4 +- hw/pxa2xx_timer.c | 2 +- hw/qdev.c | 2 +- hw/qxl.c | 1 - hw/r2d.c | 2 +- hw/realview.c | 2 +- hw/rtl8139.c | 2 +- hw/s390-virtio-bus.c | 1 - hw/s390-virtio.c | 1 - hw/scsi-disk.c | 3 +- hw/serial.c | 2 +- hw/sh7750.c | 2 +- hw/shix.c | 2 +- hw/slavio_misc.c | 2 +- hw/smbios.c | 5 +- hw/spitz.c | 3 +- hw/stellaris.c | 1 - hw/sun4m.c | 3 +- hw/sun4u.c | 2 +- hw/syborg.c | 1 - hw/syborg_virtio.c | 1 - hw/sysbus.c | 1 - hw/tc58128.c | 1 - hw/tosa.c | 1 - hw/twl92230.c | 1 - hw/usb-bus.c | 2 +- hw/usb-hid.c | 2 +- hw/usb-msd.c | 3 +- hw/usb-net.c | 2 +- hw/versatilepb.c | 2 +- hw/virtex_ml507.c | 2 +- hw/virtio-balloon.c | 1 - hw/virtio-blk.c | 1 + hw/virtio-net.c | 1 + hw/virtio.c | 1 - hw/virtio.h | 2 +- hw/vmport.c | 1 - hw/vt82c686.c | 2 +- hw/watchdog.c | 3 +- hw/xen_backend.h | 1 - hw/xen_console.c | 2 +- hw/xen_devconfig.c | 1 + hw/xen_domainbuild.c | 4 +- hw/xen_machine_pv.c | 2 +- hw/xenfb.c | 2 +- hw/xilinx_timer.c | 1 - input.c | 2 +- kvm-all.c | 3 +- kvm-stub.c | 1 - m68k-semi.c | 1 - machine-state.h | 100 ++++++++++++++++++++ migration-exec.c | 1 - migration-fd.c | 1 - migration-tcp.c | 1 - migration-unix.c | 1 - migration.c | 2 +- monitor.c | 4 +- net.c | 1 - net/dump.c | 2 +- net/slirp.c | 1 - net/tap-bsd.c | 1 - net/tap-linux.c | 1 - net/tap-solaris.c | 1 - net/tap-win32.c | 1 - net/tap.c | 1 - net/vde.c | 1 - os-posix.c | 2 +- os-win32.c | 1 - osdep.c | 1 - oslib-posix.c | 1 - oslib-win32.c | 2 +- posix-aio-compat.c | 1 - qemu-char.c | 2 +- qemu-common.h | 20 ++++ qemu-config.c | 1 - qemu-error.c | 1 - qemu-img.c | 1 - qemu-timer.c | 3 +- qemu-timer.h | 4 + qemu-tool.c | 1 - savevm.c | 3 +- sysemu.h | 207 ----------------------------------------- target-i386/helper.c | 2 +- target-i386/kvm.c | 3 +- target-ppc/kvm.c | 1 - target-s390x/kvm.c | 1 - target-sparc/op_helper.c | 2 +- ui/cocoa.m | 1 - ui/curses.c | 2 +- ui/keymaps.c | 1 - ui/sdl.c | 4 +- ui/spice-display.c | 1 - ui/vnc.c | 2 +- usb-linux.c | 2 +- vl.c | 4 +- vm-state.h | 59 ++++++++++++ 195 files changed, 366 insertions(+), 392 deletions(-) create mode 100644 host-state.h create mode 100644 machine-state.h delete mode 100644 sysemu.h create mode 100644 vm-state.h
