| Message ID | 1355768254-12933-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
Headers in the root directory are now used only from within that
directory.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
config.h => include/config.h | 0
elf.h => include/elf.h | 0
libfdt_env.h => include/libfdt_env.h | 0
qemu-common.h => include/qemu-common.h | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename config.h => include/config.h (100%)
rename elf.h => include/elf.h (100%)
rename libfdt_env.h => include/libfdt_env.h (100%)
rename qemu-common.h => include/qemu-common.h (100%)
diff --git a/config.h b/include/config.h
similarity index 100%
rename from config.h
rename to include/config.h
diff --git a/elf.h b/include/elf.h
similarity index 100%
rename from elf.h
rename to include/elf.h
diff --git a/libfdt_env.h b/include/libfdt_env.h
similarity index 100%
rename from libfdt_env.h
rename to include/libfdt_env.h
diff --git a/qemu-common.h b/include/qemu-common.h
similarity index 100%
rename from qemu-common.h
rename to include/qemu-common.h
Paolo Bonzini <pbonzini@redhat.com> writes: > Anthony, > > The following changes since commit a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0: > > exec: refactor cpu_restore_state (2012-12-16 08:35:24 +0000) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git header-dirs > > for you to fetch changes up to 394394a788cec72682750f855e5182de156026b4: > > janitor: move remaining public headers to include/ (2012-12-17 > 18:56:58 +0100) A couple issues here. It conflicts with Alex's recent pull request but this is unavoidable. I was going to repair this in the merge commit as it's basically a merge conflict. But this series breaks the build of make check. It's not just one test case but almost every single one. I think you must have eliminated an implicit include of qemu-common.h which makes PRId64 et al all undeclared. I started fixing this too but it became too much for a merge commit since it affects almost all tests. Can you fixup make check and send this series out? I'll make sure to check tomorrow and merge your pull request if I see it tomorrow. Otherwise, let me know when you plan on sending it and I'll make sure to be available to merge it. Regards, Anthony Liguori > > ---------------------------------------------------------------- > Jason Baron (1): > Fixup q35/ich9 Licenses > > Michael S. Tsirkin (12): > tap: reset vnet header size on open > get_maintainer.pl: update from linix 3.8 > pci: prepare makefiles for pci code reorganization > MAINTAINERS: add hw/pci/ to list of PCI files > pci: move pci core code to hw/pci > pci: update all users to look in pci/ > pci: fix path for local includes > Revert "pci: prepare makefiles for pci code reorganization" > pci: rename pci_internals.h pci_bus.h > pci_bus: update comment > pci_bus.h: tweak include guards > kvm: do not flush after deleting gsi > > Paolo Bonzini (33): > Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD > libcacard: simplify rules for recursive build > vscclient: use per-target variables > build: adjust setting of QEMU_INCLUDES > build: add $(TARGET_DIR) to "GEN config-target.h" lines > build: move rules from Makefile to */Makefile.objs > build: create ldscripts/ > build: kill libdis, move disassemblers to disas/ > build: kill libuser > janitor: do not rely on indirect inclusions of or from qemu-char.h > janitor: do not include qemu-char everywhere > net: move Bluetooth stuff out of net.h > net: do not include net.h everywhere > net: move net.c to net/ > net: reorganize headers > qemu-ga: move qemu-ga files to qga/ > ui: move files to ui/ and include/ui/ > qapi: move inclusions of qemu-common.h from headers to .c files > qapi: remove qapi/qapi-types-core.h > qapi: make struct Visitor opaque > janitor: add guards to headers > qapi: move include files to include/qobject/ > block: move include files to include/block/ > exec: move include files to include/exec/ > monitor: move include files to include/monitor/ > migration: move include files to include/migration/ > qom: move include files to include/qom/ > misc: move include files to include/qemu/ > softmmu: move include files to include/sysemu/ > softmmu: move remaining include files to include/ subdirectories > fpu: move public header file to include/fpu > hw: move executable format header files to hw/ > janitor: move remaining public headers to include/ > > .gitignore | 1 + > MAINTAINERS | 1 + > Makefile | 47 +-- > Makefile.dis | 20 - > Makefile.objs | 32 +- > Makefile.target | 8 +- > Makefile.user | 24 -- > a.out.h | 430 --------------------- > acl.c | 2 +- > aes.c | 2 +- > aio-posix.c | 6 +- > aio-win32.c | 6 +- > arch_init.c | 24 +- > async.c | 4 +- > audio/Makefile.objs | 3 + > audio/alsaaudio.c | 2 +- > audio/audio.c | 6 +- > audio/audio.h | 2 +- > audio/noaudio.c | 2 +- > audio/ossaudio.c | 4 +- > audio/spiceaudio.c | 2 +- > audio/wavaudio.c | 2 +- > audio/wavcapture.c | 2 +- > audio/winwaveaudio.c | 2 +- > backends/rng-egd.c | 4 +- > backends/rng-random.c | 4 +- > backends/rng.c | 2 +- > balloon.c | 10 +- > bitmap.c | 4 +- > bitops.c | 2 +- > block-migration.c | 12 +- > block.c | 18 +- > block/Makefile.objs | 2 + > block/blkdebug.c | 5 +- > block/blkverify.c | 4 +- > block/bochs.c | 4 +- > block/cloop.c | 4 +- > block/commit.c | 4 +- > block/cow.c | 4 +- > block/curl.c | 2 +- > block/dmg.c | 6 +- > block/gluster.c | 6 +- > block/iscsi.c | 5 +- > block/linux-aio.c | 6 +- > block/mirror.c | 4 +- > block/nbd.c | 10 +- > block/parallels.c | 4 +- > block/qcow.c | 8 +- > block/qcow2-cache.c | 2 +- > block/qcow2-cluster.c | 2 +- > block/qcow2-refcount.c | 2 +- > block/qcow2-snapshot.c | 2 +- > block/qcow2.c | 10 +- > block/qcow2.h | 4 +- > block/qed-table.c | 2 +- > block/qed.c | 6 +- > block/qed.h | 2 +- > block/raw-posix.c | 13 +- > block/raw-win32.c | 10 +- > block/raw.c | 4 +- > block/rbd.c | 4 +- > block/sheepdog.c | 8 +- > block/stream.c | 4 +- > block/vdi.c | 8 +- > block/vmdk.c | 6 +- > block/vpc.c | 6 +- > block/vvfat.c | 6 +- > block/win32-aio.c | 10 +- > blockdev-nbd.c | 12 +- > blockdev.c | 20 +- > blockjob.c | 14 +- > bsd-user/elfload.c | 2 +- > bsd-user/main.c | 4 +- > bsd-user/qemu.h | 6 +- > bt-host.c | 5 +- > bt-host.h | 9 - > bt-vhci.c | 4 +- > buffered_file.c | 3 +- > buffered_file.h | 2 +- > cache-utils.c | 2 +- > cmd.c | 4 +- > compatfd.c | 2 +- > configure | 53 +-- > coroutine-gthread.c | 2 +- > coroutine-sigaltstack.c | 2 +- > coroutine-ucontext.c | 2 +- > coroutine-win32.c | 2 +- > cpu-exec.c | 6 +- > cpus.c | 22 +- > cputlb.c | 18 +- > cutils.c | 6 +- > device_tree.c | 6 +- > disas.c | 6 +- > disas/Makefile.objs | 16 + > alpha-dis.c => disas/alpha.c | 2 +- > arm-dis.c => disas/arm.c | 2 +- > cris-dis.c => disas/cris.c | 2 +- > hppa-dis.c => disas/hppa.c | 2 +- > i386-dis.c => disas/i386.c | 2 +- > ia64-dis.c => disas/ia64.c | 2 +- > lm32-dis.c => disas/lm32.c | 2 +- > m68k-dis.c => disas/m68k.c | 2 +- > microblaze-dis.c => disas/microblaze.c | 2 +- > mips-dis.c => disas/mips.c | 2 +- > ppc-dis.c => disas/ppc.c | 2 +- > s390-dis.c => disas/s390.c | 2 +- > sh4-dis.c => disas/sh4.c | 2 +- > sparc-dis.c => disas/sparc.c | 2 +- > tci-dis.c => disas/tci.c | 2 +- > dma-helpers.c | 6 +- > dump-stub.c | 4 +- > dump.c | 18 +- > envlist.c | 4 +- > error.c | 8 +- > event_notifier-posix.c | 5 +- > event_notifier-win32.c | 4 +- > exec.c | 19 +- > fpu/softfloat.c | 2 +- > fsdev/qemu-fsdev-dummy.c | 4 +- > fsdev/qemu-fsdev.c | 6 +- > fsdev/qemu-fsdev.h | 2 +- > fsdev/virtfs-proxy-helper.c | 4 +- > fsdev/virtio-9p-marshal.c | 4 +- > gdbstub.c | 12 +- > hmp.c | 13 +- > hmp.h | 2 +- > host-utils.c | 2 +- > hw/9pfs/codir.c | 4 +- > hw/9pfs/cofile.c | 4 +- > hw/9pfs/cofs.c | 4 +- > hw/9pfs/coxattr.c | 4 +- > hw/9pfs/virtio-9p-coth.c | 5 +- > hw/9pfs/virtio-9p-coth.h | 4 +- > hw/9pfs/virtio-9p-device.c | 2 +- > hw/9pfs/virtio-9p-handle.c | 2 +- > hw/9pfs/virtio-9p-local.c | 2 +- > hw/9pfs/virtio-9p-posix-acl.c | 2 +- > hw/9pfs/virtio-9p-synth.h | 4 + > hw/9pfs/virtio-9p-xattr.h | 2 +- > hw/9pfs/virtio-9p.c | 4 +- > hw/9pfs/virtio-9p.h | 4 +- > hw/Makefile.objs | 15 +- > hw/ac97.c | 4 +- > hw/acpi.c | 4 +- > hw/acpi.h | 2 +- > hw/acpi_ich9.c | 23 +- > hw/acpi_piix4.c | 10 +- > hw/adb.c | 2 +- > hw/adlib.c | 2 +- > hw/ads7846.c | 2 +- > hw/alpha_dp264.c | 2 +- > hw/alpha_pci.c | 4 +- > hw/alpha_sys.h | 5 +- > hw/alpha_typhoon.c | 6 +- > hw/an5206.c | 2 +- > hw/apb_pci.c | 12 +- > hw/apic.c | 6 +- > hw/apic_common.c | 2 +- > hw/apic_internal.h | 4 +- > hw/apm.c | 2 +- > hw/apm.h | 2 +- > hw/applesmc.c | 4 +- > hw/arm-misc.h | 2 +- > hw/arm11mpcore.c | 2 +- > hw/arm_boot.c | 5 +- > hw/arm_mptimer.c | 2 +- > hw/arm_sysctl.c | 4 +- > hw/arm_timer.c | 2 +- > hw/armv7m_nvic.c | 4 +- > hw/audiodev.h | 5 + > hw/axis_dev88.c | 6 +- > hw/baum.c | 4 +- > hw/baum.h | 4 + > hw/blizzard.c | 4 +- > hw/block-common.c | 4 +- > hw/boards.h | 2 +- > hw/bonito.c | 8 +- > hw/bt-hci-csr.c | 6 +- > hw/bt-hci.c | 4 +- > hw/bt-hid.c | 4 +- > hw/bt-l2cap.c | 2 +- > hw/bt.c | 2 +- > hw/bt.h | 5 + > hw/cadence_gem.c | 2 +- > hw/cadence_ttc.c | 2 +- > hw/cadence_uart.c | 4 +- > hw/cbus.c | 2 +- > hw/ccid-card-emulated.c | 6 +- > hw/ccid-card-passthru.c | 6 +- > hw/cirrus_vga.c | 4 +- > hw/collie.c | 4 +- > hw/cris-boot.h | 4 + > hw/cs4231a.c | 2 +- > hw/cuda.c | 4 +- > hw/debugcon.c | 2 +- > hw/dec_pci.c | 8 +- > hw/device-hotplug.c | 9 +- > hw/dma.c | 1 + > hw/dp8393x.c | 4 +- > hw/dummy_m68k.c | 2 +- > hw/e1000.c | 8 +- > hw/eepro100.c | 8 +- > hw/empty_slot.h | 5 + > hw/es1370.c | 4 +- > hw/escc.c | 4 +- > hw/escc.h | 5 + > hw/esp-pci.c | 4 +- > hw/esp.c | 2 +- > hw/etraxfs.h | 7 +- > hw/etraxfs_dma.c | 4 +- > hw/etraxfs_dma.h | 5 + > hw/etraxfs_eth.c | 2 +- > hw/etraxfs_ser.c | 4 +- > hw/etraxfs_timer.c | 4 +- > hw/exynos4210.c | 2 +- > hw/exynos4210.h | 2 +- > hw/exynos4210_fimd.c | 8 +- > hw/exynos4210_i2c.c | 2 +- > hw/exynos4210_mct.c | 2 +- > hw/exynos4210_pwm.c | 2 +- > hw/exynos4210_rtc.c | 6 +- > hw/exynos4210_uart.c | 4 +- > hw/exynos4_boards.c | 6 +- > hw/fdc.c | 10 +- > hw/flash.h | 7 +- > hw/framebuffer.c | 2 +- > hw/framebuffer.h | 2 +- > hw/fw_cfg.c | 5 +- > hw/g364fb.c | 4 +- > hw/grackle_pci.c | 4 +- > hw/grlib_apbuart.c | 2 +- > hw/grlib_gptimer.c | 2 +- > hw/gt64xxx.c | 6 +- > hw/gumstix.c | 6 +- > hw/hd-geometry.c | 2 +- > hw/hda-audio.c | 2 +- > hw/hid.c | 4 +- > hw/hid.h | 2 +- > hw/highbank.c | 8 +- > hw/hpet.c | 4 +- > hw/hw.h | 12 +- > hw/i386/Makefile.objs | 2 +- > hw/i82378.c | 2 +- > hw/i8254.c | 2 +- > hw/i8254_common.c | 2 +- > hw/i8259.c | 4 +- > hw/i82801b11.c | 2 +- > hw/ich9.h | 10 +- > hw/ide.h | 4 +- > hw/ide/ahci.c | 10 +- > hw/ide/cmd646.c | 8 +- > hw/ide/core.c | 12 +- > hw/ide/ich.c | 8 +- > hw/ide/internal.h | 6 +- > hw/ide/isa.c | 4 +- > hw/ide/macio.c | 4 +- > hw/ide/microdrive.c | 4 +- > hw/ide/mmio.c | 4 +- > hw/ide/pci.c | 6 +- > hw/ide/piix.c | 8 +- > hw/ide/qdev.c | 8 +- > hw/ide/via.c | 8 +- > hw/imx_avic.c | 2 +- > hw/imx_ccm.c | 2 +- > hw/imx_serial.c | 4 +- > hw/imx_timer.c | 2 +- > hw/integratorcp.c | 6 +- > hw/intel-hda.c | 8 +- > hw/ioapic_internal.h | 2 +- > hw/ioh3420.c | 6 +- > hw/ioh3420.h | 2 +- > hw/isa-bus.c | 6 +- > hw/isa.h | 4 +- > hw/isa_mmio.c | 2 +- > hw/ivshmem.c | 13 +- > hw/jazz_led.c | 5 +- > hw/kvm/apic.c | 4 +- > hw/kvm/clock.c | 4 +- > hw/kvm/i8254.c | 6 +- > hw/kvm/i8259.c | 2 +- > hw/kvm/ioapic.c | 2 +- > hw/kvm/pci-assign.c | 14 +- > hw/kvmvapic.c | 6 +- > hw/kzm.c | 6 +- > hw/lan9118.c | 4 +- > hw/lance.c | 6 +- > hw/leon3.c | 8 +- > hw/lm32.h | 5 + > hw/lm32_boards.c | 5 +- > hw/lm32_juart.c | 2 +- > hw/lm32_pic.c | 2 +- > hw/lm32_sys.c | 8 +- > hw/lm32_timer.c | 4 +- > hw/lm32_uart.c | 4 +- > hw/lm832x.c | 4 +- > hw/loader.c | 10 +- > hw/lpc_ich9.c | 46 +-- > hw/lsi53c895a.c | 4 +- > hw/m25p80.c | 2 +- > hw/m48t59.c | 6 +- > hw/mac_dbdma.c | 1 + > hw/mac_dbdma.h | 6 +- > hw/mac_nvram.c | 2 +- > hw/macio.c | 2 +- > hw/mainstone.c | 6 +- > hw/mc146818rtc.c | 6 +- > hw/mcf5206.c | 6 +- > hw/mcf5208.c | 8 +- > hw/mcf_fec.c | 4 +- > hw/mcf_intc.c | 2 +- > hw/mcf_uart.c | 4 +- > hw/megasas.c | 8 +- > hw/microblaze_boot.c | 6 +- > hw/milkymist-ac97.c | 2 +- > hw/milkymist-hpdmc.c | 2 +- > hw/milkymist-hw.h | 1 + > hw/milkymist-memcard.c | 6 +- > hw/milkymist-minimac2.c | 4 +- > hw/milkymist-pfpu.c | 4 +- > hw/milkymist-softusb.c | 4 +- > hw/milkymist-sysctl.c | 6 +- > hw/milkymist-tmu2.c | 2 +- > hw/milkymist-uart.c | 4 +- > hw/milkymist-vgafb.c | 6 +- > hw/milkymist.c | 7 +- > hw/mips.h | 2 +- > hw/mips_fulong2e.c | 16 +- > hw/mips_jazz.c | 10 +- > hw/mips_malta.c | 18 +- > hw/mips_mipssim.c | 6 +- > hw/mips_r4k.c | 10 +- > hw/mips_timer.c | 2 +- > hw/mipsnet.c | 2 +- > hw/mpc8544_guts.c | 2 +- > hw/msmouse.c | 6 +- > hw/msmouse.h | 5 + > hw/multiboot.c | 2 +- > hw/musicpal.c | 17 +- > hw/nand.c | 4 +- > hw/ne2000-isa.c | 4 +- > hw/ne2000.c | 6 +- > hw/ne2000.h | 5 + > hw/nseries.c | 8 +- > hw/omap.h | 2 +- > hw/omap1.c | 6 +- > hw/omap2.c | 8 +- > hw/omap_dma.c | 2 +- > hw/omap_dss.c | 2 +- > hw/omap_gpmc.c | 4 +- > hw/omap_gptimer.c | 2 +- > hw/omap_lcdc.c | 5 +- > hw/omap_sx1.c | 6 +- > hw/omap_synctimer.c | 2 +- > hw/omap_uart.c | 4 +- > hw/onenand.c | 8 +- > hw/opencores_eth.c | 4 +- > hw/openpic.c | 4 +- > hw/openrisc_sim.c | 8 +- > hw/openrisc_timer.c | 2 +- > hw/palm.c | 6 +- > hw/pam.c | 2 +- > hw/pam.h | 2 +- > hw/parallel.c | 4 +- > hw/pc.c | 20 +- > hw/pc.h | 8 +- > hw/pc_piix.c | 18 +- > hw/pc_q35.c | 6 +- > hw/pc_sysfw.c | 6 +- > hw/pci/Makefile.objs | 9 + > hw/{ => pci}/msi.c | 4 +- > hw/{ => pci}/msi.h | 2 +- > hw/{ => pci}/msix.c | 10 +- > hw/{ => pci}/msix.h | 2 +- > hw/{ => pci}/pci-hotplug.c | 22 +- > hw/{ => pci}/pci-stub.c | 6 +- > hw/{ => pci}/pci.c | 24 +- > hw/{ => pci}/pci.h | 14 +- > hw/{ => pci}/pci_bridge.c | 6 +- > hw/{ => pci}/pci_bridge.h | 2 +- > hw/{pci_internals.h => pci/pci_bus.h} | 16 +- > hw/{ => pci}/pci_host.c | 4 +- > hw/{ => pci}/pci_host.h | 2 +- > hw/{ => pci}/pci_ids.h | 4 + > hw/{ => pci}/pci_regs.h | 0 > hw/{ => pci}/pcie.c | 14 +- > hw/{ => pci}/pcie.h | 8 +- > hw/{ => pci}/pcie_aer.c | 18 +- > hw/{ => pci}/pcie_aer.h | 2 +- > hw/{ => pci}/pcie_host.c | 8 +- > hw/{ => pci}/pcie_host.h | 4 +- > hw/{ => pci}/pcie_port.c | 2 +- > hw/{ => pci}/pcie_port.h | 4 +- > hw/{ => pci}/pcie_regs.h | 0 > hw/{ => pci}/shpc.c | 12 +- > hw/{ => pci}/shpc.h | 4 +- > hw/{ => pci}/slotid_cap.c | 4 +- > hw/{ => pci}/slotid_cap.h | 0 > hw/pci_bridge_dev.c | 14 +- > hw/pckbd.c | 2 +- > hw/pcmcia.h | 5 + > hw/pcnet-pci.c | 8 +- > hw/pcnet.c | 8 +- > hw/pcnet.h | 7 +- > hw/pcspk.c | 2 +- > hw/petalogix_ml605_mmu.c | 8 +- > hw/petalogix_s3adsp1800_mmu.c | 8 +- > hw/pflash_cfi01.c | 8 +- > hw/pflash_cfi02.c | 8 +- > hw/piix4.c | 2 +- > hw/piix_pci.c | 6 +- > hw/pl011.c | 2 +- > hw/pl031.c | 4 +- > hw/pl110.c | 5 +- > hw/pl181.c | 2 +- > hw/ppc.c | 8 +- > hw/ppc.h | 5 + > hw/ppc/Makefile.objs | 2 +- > hw/ppc/e500.c | 12 +- > hw/ppc/e500plat.c | 2 +- > hw/ppc/mpc8544ds.c | 2 +- > hw/ppc405_boards.c | 10 +- > hw/ppc405_uc.c | 8 +- > hw/ppc440_bamboo.c | 12 +- > hw/ppc4xx.h | 2 +- > hw/ppc4xx_devs.c | 4 +- > hw/ppc4xx_pci.c | 6 +- > hw/ppc_booke.c | 6 +- > hw/ppc_mac.h | 2 +- > hw/ppc_newworld.c | 12 +- > hw/ppc_oldworld.c | 12 +- > hw/ppc_prep.c | 16 +- > hw/ppce500_pci.c | 8 +- > hw/ppce500_spin.c | 4 +- > hw/prep_pci.c | 6 +- > hw/ps2.c | 4 +- > hw/ptimer.c | 4 +- > hw/ptimer.h | 4 +- > hw/puv3.c | 6 +- > hw/pxa.h | 2 +- > hw/pxa2xx.c | 6 +- > hw/pxa2xx_keypad.c | 2 +- > hw/pxa2xx_lcd.c | 6 +- > hw/pxa2xx_timer.c | 4 +- > hw/q35.h | 6 +- > hw/qdev-addr.c | 4 +- > hw/qdev-addr.h | 5 + > hw/qdev-core.h | 10 +- > hw/qdev-monitor.c | 5 +- > hw/qdev-monitor.h | 2 +- > hw/qdev-properties.c | 9 +- > hw/qdev.c | 8 +- > hw/qxl-logger.c | 2 +- > hw/qxl.c | 8 +- > hw/qxl.h | 11 +- > hw/r2d.c | 10 +- > hw/rc4030.c | 2 +- > hw/realview.c | 10 +- > hw/rtl8139.c | 12 +- > hw/s390-virtio-bus.c | 9 +- > hw/s390-virtio-bus.h | 4 + > hw/s390-virtio.c | 14 +- > hw/s390x/event-facility.c | 4 +- > hw/s390x/event-facility.h | 2 +- > hw/s390x/sclp.c | 4 +- > hw/s390x/sclpconsole.c | 3 +- > hw/s390x/sclpquiesce.c | 2 +- > hw/sb16.c | 4 +- > hw/scsi-bus.c | 6 +- > hw/scsi-defs.h | 4 + > hw/scsi-disk.c | 8 +- > hw/scsi-generic.c | 4 +- > hw/scsi.h | 4 +- > hw/sd.c | 4 +- > hw/serial-pci.c | 2 +- > hw/serial.c | 6 +- > hw/serial.h | 8 +- > hw/sga.c | 4 +- > hw/sh7750.c | 4 +- > hw/sh_intc.h | 2 +- > hw/sh_pci.c | 8 +- > hw/sh_serial.c | 4 +- > hw/sh_timer.c | 4 +- > hw/shix.c | 4 +- > hw/slavio_intctl.c | 2 +- > hw/slavio_misc.c | 2 +- > hw/slavio_timer.c | 2 +- > hw/sm501.c | 7 +- > hw/smbios.c | 2 +- > hw/smbus_ich9.c | 18 +- > hw/smc91c111.c | 2 +- > hw/soc_dma.c | 2 +- > hw/soc_dma.h | 8 +- > hw/spapr.c | 18 +- > hw/spapr.h | 2 +- > hw/spapr_events.c | 6 +- > hw/spapr_hcall.c | 6 +- > hw/spapr_iommu.c | 6 +- > hw/spapr_llan.c | 2 +- > hw/spapr_nvram.c | 2 +- > hw/spapr_pci.c | 12 +- > hw/spapr_pci.h | 4 +- > hw/spapr_rtas.c | 6 +- > hw/spapr_vio.c | 8 +- > hw/spapr_vio.h | 2 +- > hw/spapr_vscsi.c | 1 - > hw/spapr_vty.c | 2 +- > hw/spitz.c | 12 +- > hw/ssd0303.c | 2 +- > hw/ssd0323.c | 2 +- > hw/ssi-sd.c | 2 +- > hw/stellaris.c | 6 +- > hw/stellaris_enet.c | 2 +- > hw/stellaris_input.c | 2 +- > hw/stream.h | 2 +- > hw/strongarm.c | 5 +- > hw/strongarm.h | 2 +- > hw/sun4c_intctl.c | 2 +- > hw/sun4m.c | 8 +- > hw/sun4u.c | 12 +- > hw/sysbus.c | 4 +- > hw/sysbus.h | 2 +- > hw/tc6393xb.c | 6 +- > hw/tcx.c | 5 +- > hw/tosa.c | 6 +- > hw/tsc2005.c | 4 +- > hw/tsc210x.c | 4 +- > hw/tusb6010.c | 2 +- > hw/twl92230.c | 6 +- > uboot_image.h => hw/uboot_image.h | 0 > hw/unin_pci.c | 4 +- > hw/usb.h | 2 +- > hw/usb/bus.c | 4 +- > hw/usb/combined-packet.c | 2 +- > hw/usb/core.c | 2 +- > hw/usb/dev-bluetooth.c | 2 +- > hw/usb/dev-hid.c | 4 +- > hw/usb/dev-network.c | 9 +- > hw/usb/dev-serial.c | 4 +- > hw/usb/dev-smartcard-reader.c | 4 +- > hw/usb/dev-storage.c | 12 +- > hw/usb/dev-uas.c | 4 +- > hw/usb/dev-wacom.c | 2 +- > hw/usb/hcd-ehci-pci.c | 4 +- > hw/usb/hcd-ehci.h | 12 +- > hw/usb/hcd-musb.c | 2 +- > hw/usb/hcd-ohci.c | 4 +- > hw/usb/hcd-uhci.c | 8 +- > hw/usb/hcd-xhci.c | 8 +- > hw/usb/host-bsd.c | 2 +- > hw/usb/host-linux.c | 6 +- > hw/usb/host-stub.c | 4 +- > hw/usb/libhw.c | 4 +- > hw/usb/redirect.c | 8 +- > hw/versatile_pci.c | 6 +- > hw/versatilepb.c | 10 +- > hw/vexpress.c | 8 +- > hw/vfio_pci.c | 20 +- > hw/vga-isa-mm.c | 6 +- > hw/vga-isa.c | 6 +- > hw/vga-pci.c | 8 +- > hw/vga.c | 8 +- > hw/vga_int.h | 8 +- > hw/vhost.c | 4 +- > hw/vhost.h | 2 +- > hw/vhost_net.c | 4 +- > hw/vhost_net.h | 2 +- > hw/virtex_ml507.c | 11 +- > hw/virtio-balloon.c | 8 +- > hw/virtio-balloon.h | 2 +- > hw/virtio-blk.c | 4 +- > hw/virtio-console.c | 4 +- > hw/virtio-net.c | 8 +- > hw/virtio-net.h | 30 +- > hw/virtio-pci.c | 15 +- > hw/virtio-rng.c | 2 +- > hw/virtio-scsi.h | 3 +- > hw/virtio-serial-bus.c | 6 +- > hw/virtio.c | 4 +- > hw/virtio.h | 6 +- > hw/vmmouse.c | 2 +- > hw/vmport.c | 2 +- > hw/vmware_vga.c | 4 +- > hw/vt82c686.c | 10 +- > hw/watchdog.c | 12 +- > hw/watchdog.h | 2 +- > hw/wdt_i6300esb.c | 4 +- > hw/wdt_ib700.c | 2 +- > hw/xen-host-pci-device.h | 2 +- > hw/xen_apic.c | 2 +- > hw/xen_backend.c | 4 +- > hw/xen_backend.h | 5 +- > hw/xen_common.h | 2 +- > hw/xen_console.c | 2 +- > hw/xen_devconfig.c | 2 +- > hw/xen_disk.c | 3 +- > hw/xen_domainbuild.c | 4 +- > hw/xen_machine_pv.c | 2 +- > hw/xen_nic.c | 3 +- > hw/xen_platform.c | 5 +- > hw/xen_pt.c | 6 +- > hw/xen_pt.h | 2 +- > hw/xen_pt_config_init.c | 2 +- > hw/xenfb.c | 4 +- > hw/xgmac.c | 6 +- > hw/xilinx.h | 8 +- > hw/xilinx_axidma.c | 5 +- > hw/xilinx_axienet.c | 5 +- > hw/xilinx_ethlite.c | 2 +- > hw/xilinx_spi.c | 4 +- > hw/xilinx_spips.c | 6 +- > hw/xilinx_timer.c | 2 +- > hw/xilinx_uartlite.c | 2 +- > hw/xilinx_zynq.c | 8 +- > hw/xio3130_downstream.c | 6 +- > hw/xio3130_downstream.h | 2 +- > hw/xio3130_upstream.c | 6 +- > hw/xio3130_upstream.h | 2 +- > hw/xtensa_lx60.c | 11 +- > hw/xtensa_pic.c | 4 +- > hw/xtensa_sim.c | 6 +- > hw/z2.c | 8 +- > hw/zynq_slcr.c | 4 +- > aes.h => include/block/aes.h | 0 > qemu-aio.h => include/block/aio.h | 4 +- > block.h => include/block/block.h | 8 +- > block_int.h => include/block/block_int.h | 14 +- > blockjob.h => include/block/blockjob.h | 2 +- > qemu-coroutine.h => include/block/coroutine.h | 4 +- > .../block/coroutine_int.h | 4 +- > nbd.h => include/block/nbd.h | 0 > thread-pool.h => include/block/thread-pool.h | 8 +- > include/bt/bt.h | 20 + > qemu-char.h => include/char/char.h | 14 +- > config.h => include/config.h | 0 > dis-asm.h => include/disas/bfd.h | 0 > disas.h => include/disas/disas.h | 0 > elf.h => include/elf.h | 0 > exec-memory.h => include/exec/address-spaces.h | 2 +- > cpu-all.h => include/exec/cpu-all.h | 6 +- > cpu-common.h => include/exec/cpu-common.h | 8 +- > cpu-defs.h => include/exec/cpu-defs.h | 6 +- > cputlb.h => include/exec/cputlb.h | 0 > def-helper.h => include/exec/def-helper.h | 0 > exec-all.h => include/exec/exec-all.h | 14 +- > gdbstub.h => include/exec/gdbstub.h | 0 > gen-icount.h => include/exec/gen-icount.h | 7 +- > hwaddr.h => include/exec/hwaddr.h | 0 > ioport.h => include/exec/ioport.h | 2 +- > iorange.h => include/exec/iorange.h | 0 > .../exec/memory-internal.h | 0 > memory.h => include/exec/memory.h | 12 +- > poison.h => include/exec/poison.h | 0 > softmmu-semi.h => include/exec/softmmu-semi.h | 4 + > softmmu_defs.h => include/exec/softmmu_defs.h | 0 > softmmu_exec.h => include/exec/softmmu_exec.h | 58 +-- > softmmu_header.h => include/exec/softmmu_header.h | 0 > .../exec/softmmu_template.h | 4 +- > qemu-lock.h => include/exec/spinlock.h | 0 > qemu-user-types.h => include/exec/user/abitypes.h | 0 > thunk.h => include/exec/user/thunk.h | 0 > {fpu => include/fpu}/softfloat.h | 2 +- > libfdt_env.h => include/libfdt_env.h | 2 +- > block-migration.h => include/migration/block.h | 0 > migration.h => include/migration/migration.h | 8 +- > include/{qemu => migration}/page_cache.h | 0 > qemu-file.h => include/migration/qemu-file.h | 0 > vmstate.h => include/migration/vmstate.h | 0 > monitor.h => include/monitor/monitor.h | 9 +- > readline.h => include/monitor/readline.h | 0 > {net => include/net}/checksum.h | 0 > net.h => include/net/net.h | 25 +- > {net => include/net}/queue.h | 0 > {net => include/net}/slirp.h | 4 +- > include/net/tap.h | 67 ++++ > .../qapi/dealloc-visitor.h | 2 +- > error.h => include/qapi/error.h | 2 +- > {qapi => include/qapi}/opts-visitor.h | 4 +- > {qapi => include/qapi}/qmp-input-visitor.h | 4 +- > {qapi => include/qapi}/qmp-output-visitor.h | 4 +- > qapi/qmp-core.h => include/qapi/qmp/dispatch.h | 6 +- > json-lexer.h => include/qapi/qmp/json-lexer.h | 4 +- > json-parser.h => include/qapi/qmp/json-parser.h | 4 +- > .../qapi/qmp/json-streamer.h | 4 +- > qbool.h => include/qapi/qmp/qbool.h | 2 +- > qdict.h => include/qapi/qmp/qdict.h | 6 +- > qerror.h => include/qapi/qmp/qerror.h | 8 +- > qfloat.h => include/qapi/qmp/qfloat.h | 2 +- > qint.h => include/qapi/qmp/qint.h | 2 +- > qjson.h => include/qapi/qmp/qjson.h | 6 +- > qlist.h => include/qapi/qmp/qlist.h | 6 +- > qobject.h => include/qapi/qmp/qobject.h | 0 > qstring.h => include/qapi/qmp/qstring.h | 2 +- > qemu-objects.h => include/qapi/qmp/types.h | 16 +- > {qapi => include/qapi}/string-input-visitor.h | 2 +- > {qapi => include/qapi}/string-output-visitor.h | 2 +- > include/qapi/visitor-impl.h | 63 +++ > qapi/qapi-visit-core.h => include/qapi/visitor.h | 42 +- > qemu-common.h => include/qemu-common.h | 14 +- > acl.h => include/qemu/acl.h | 2 +- > qemu-barrier.h => include/qemu/atomic.h | 2 +- > bitmap.h => include/qemu/bitmap.h | 2 +- > bitops.h => include/qemu/bitops.h | 0 > bswap.h => include/qemu/bswap.h | 2 +- > cache-utils.h => include/qemu/cache-utils.h | 0 > compatfd.h => include/qemu/compatfd.h | 0 > compiler.h => include/qemu/compiler.h | 0 > qemu-config.h => include/qemu/config-file.h | 5 +- > envlist.h => include/qemu/envlist.h | 0 > qemu-error.h => include/qemu/error-report.h | 0 > event_notifier.h => include/qemu/event_notifier.h | 0 > host-utils.h => include/qemu/host-utils.h | 6 +- > int128.h => include/qemu/int128.h | 0 > iov.h => include/qemu/iov.h | 5 + > qemu-log.h => include/qemu/log.h | 2 +- > main-loop.h => include/qemu/main-loop.h | 2 +- > module.h => include/qemu/module.h | 0 > notify.h => include/qemu/notify.h | 2 +- > qemu-option.h => include/qemu/option.h | 6 +- > .../qemu/option_int.h | 3 +- > osdep.h => include/qemu/osdep.h | 0 > qemu-queue.h => include/qemu/queue.h | 2 +- > range.h => include/qemu/range.h | 0 > include/qemu/rng-random.h | 2 +- > include/qemu/rng.h | 4 +- > qemu_socket.h => include/qemu/sockets.h | 6 +- > qemu-thread-posix.h => include/qemu/thread-posix.h | 0 > qemu-thread-win32.h => include/qemu/thread-win32.h | 0 > qemu-thread.h => include/qemu/thread.h | 4 +- > qemu-timer.h => include/qemu/timer.h | 4 +- > qemu-tls.h => include/qemu/tls.h | 0 > qemu-types.h => include/qemu/typedefs.h | 0 > uri.h => include/qemu/uri.h | 0 > qemu-xattr.h => include/qemu/xattr.h | 0 > include/{qemu => qom}/cpu.h | 4 +- > include/{qemu => qom}/object.h | 2 +- > include/{qemu => qom}/qom-qobject.h | 2 +- > arch_init.h => include/sysemu/arch_init.h | 0 > balloon.h => include/sysemu/balloon.h | 2 +- > blockdev.h => include/sysemu/blockdev.h | 6 +- > cpus.h => include/sysemu/cpus.h | 0 > device_tree.h => include/sysemu/device_tree.h | 0 > dma.h => include/sysemu/dma.h | 6 +- > dump.h => include/sysemu/dump.h | 0 > kvm.h => include/sysemu/kvm.h | 2 +- > .../sysemu/memory_mapping.h | 2 +- > qemu-os-posix.h => include/sysemu/os-posix.h | 0 > qemu-os-win32.h => include/sysemu/os-win32.h | 0 > qtest.h => include/sysemu/qtest.h | 0 > qemu-seccomp.h => include/sysemu/seccomp.h | 2 +- > sysemu.h => include/sysemu/sysemu.h | 12 +- > xen-mapcache.h => include/sysemu/xen-mapcache.h | 0 > console.h => include/ui/console.h | 11 +- > {hw => include/ui}/pixel_ops.h | 0 > qemu-pixman.h => include/ui/qemu-pixman.h | 0 > {ui => include/ui}/qemu-spice.h | 9 +- > {ui => include/ui}/spice-display.h | 6 +- > iohandler.c | 7 +- > ioport.c | 4 +- > iov.c | 2 +- > json-lexer.c | 10 +- > json-parser.c | 18 +- > json-streamer.c | 10 +- > kvm-all.c | 24 +- > kvm-stub.c | 6 +- > alpha.ld => ldscripts/alpha.ld | 0 > arm.ld => ldscripts/arm.ld | 0 > hppa.ld => ldscripts/hppa.ld | 0 > i386.ld => ldscripts/i386.ld | 0 > ia64.ld => ldscripts/ia64.ld | 0 > m68k.ld => ldscripts/m68k.ld | 0 > mips.ld => ldscripts/mips.ld | 0 > ppc.ld => ldscripts/ppc.ld | 0 > ppc64.ld => ldscripts/ppc64.ld | 0 > s390.ld => ldscripts/s390.ld | 0 > sparc.ld => ldscripts/sparc.ld | 0 > sparc64.ld => ldscripts/sparc64.ld | 0 > x86_64.ld => ldscripts/x86_64.ld | 0 > libcacard/event.c | 2 +- > libcacard/vreader.c | 2 +- > libcacard/vscclient.c | 4 +- > linux-user/arm/nwfpe/double_cpdo.c | 2 +- > linux-user/arm/nwfpe/extended_cpdo.c | 2 +- > linux-user/arm/nwfpe/fpa11.h | 2 +- > linux-user/arm/nwfpe/fpa11_cpdt.c | 2 +- > linux-user/arm/nwfpe/fpa11_cprt.c | 2 +- > linux-user/arm/nwfpe/fpopcode.c | 2 +- > linux-user/arm/nwfpe/single_cpdo.c | 2 +- > linux-user/cris/syscall.h | 5 + > linux-user/elfload.c | 2 +- > linux-user/main.c | 6 +- > linux-user/microblaze/syscall.h | 6 + > linux-user/qemu.h | 10 +- > linux-user/syscall.c | 2 +- > linux-user/syscall_defs.h | 6 + > main-loop.c | 8 +- > memory.c | 12 +- > memory_mapping-stub.c | 4 +- > memory_mapping.c | 4 +- > migration-exec.c | 7 +- > migration-fd.c | 11 +- > migration-tcp.c | 7 +- > migration-unix.c | 7 +- > migration.c | 12 +- > module.c | 4 +- > monitor.c | 52 +-- > nbd.c | 10 +- > net/Makefile.objs | 2 +- > net/clients.h | 2 +- > net/dump.c | 6 +- > net/hub.c | 6 +- > net/hub.h | 2 - > net.c => net/net.c | 17 +- > net/queue.c | 4 +- > net/slirp.c | 7 +- > net/socket.c | 13 +- > net/tap-aix.c | 2 +- > net/tap-bsd.c | 6 +- > net/tap-haiku.c | 2 +- > net/tap-linux.c | 15 +- > net/tap-linux.h | 20 +- > net/tap-solaris.c | 6 +- > net/tap-win32.c | 8 +- > net/tap.c | 13 +- > net/{tap.h => tap_int.h} | 18 +- > net/util.c | 2 +- > net/vde.c | 5 +- > notify.c | 2 +- > os-posix.c | 2 +- > os-win32.c | 2 +- > osdep.c | 4 +- > oslib-posix.c | 4 +- > oslib-win32.c | 6 +- > page_cache.c | 2 +- > pixman | 2 +- > qapi/opts-visitor.c | 10 +- > qapi/qapi-dealloc-visitor.c | 7 +- > qapi/qapi-types-core.h | 21 - > qapi/qapi-visit-core.c | 6 +- > qapi/qapi-visit-impl.h | 23 -- > qapi/qmp-dispatch.c | 10 +- > qapi/qmp-input-visitor.c | 10 +- > qapi/qmp-output-visitor.c | 10 +- > qapi/qmp-registry.c | 2 +- > qapi/string-input-visitor.c | 6 +- > qapi/string-output-visitor.c | 6 +- > qbool.c | 4 +- > qdict.c | 14 +- > qemu-bridge-helper.c | 2 +- > qemu-char.c | 13 +- > qemu-config.c | 8 +- > qemu-coroutine-io.c | 6 +- > qemu-coroutine-lock.c | 8 +- > qemu-coroutine-sleep.c | 4 +- > qemu-coroutine.c | 4 +- > qemu-error.c | 2 +- > qemu-img.c | 12 +- > qemu-io.c | 4 +- > qemu-log.c | 2 +- > qemu-nbd.c | 4 +- > qemu-option.c | 10 +- > qemu-progress.c | 4 +- > qemu-seccomp.c | 2 +- > qemu-sockets.c | 6 +- > qemu-thread-posix.c | 2 +- > qemu-thread-win32.c | 2 +- > qemu-timer-common.c | 2 +- > qemu-timer.c | 11 +- > qemu-tool.c | 14 +- > qemu-user.c | 2 +- > qerror.c | 6 +- > qfloat.c | 4 +- > qga/Makefile.objs | 2 +- > qga/channel-posix.c | 4 +- > qga/commands-posix.c | 6 +- > qga/commands-win32.c | 2 +- > qga/commands.c | 2 +- > qga/guest-agent-core.h | 2 +- > qemu-ga.c => qga/main.c | 14 +- > qapi-schema-guest.json => qga/qapi-schema.json | 0 > qint.c | 4 +- > qjson.c | 18 +- > qlist.c | 6 +- > qmp.c | 11 +- > qom/container.c | 4 +- > qom/cpu.c | 2 +- > qom/object.c | 15 +- > qom/qom-qobject.c | 6 +- > qstring.c | 4 +- > qtest.c | 12 +- > readline.c | 4 +- > rules.mak | 5 +- > savevm.c | 23 +- > scripts/feature_to_c.sh | 2 +- > scripts/get_maintainer.pl | 25 +- > scripts/qapi-commands.py | 15 +- > scripts/qapi-types.py | 2 +- > scripts/qapi-visit.py | 3 +- > slirp/bootp.h | 4 + > slirp/if.c | 2 +- > slirp/ip_input.c | 2 +- > slirp/main.h | 4 + > slirp/misc.c | 4 +- > slirp/sbuf.c | 2 +- > slirp/slirp.c | 4 +- > slirp/slirp.h | 4 +- > slirp/tftp.h | 4 + > spice-qemu-char.c | 3 +- > stubs/arch-query-cpu-def.c | 4 +- > stubs/fd-register.c | 2 +- > stubs/fdset-add-fd.c | 2 +- > stubs/fdset-find-fd.c | 2 +- > stubs/fdset-get-fd.c | 2 +- > stubs/fdset-remove-fd.c | 2 +- > stubs/get-fd.c | 2 +- > stubs/set-fd-handler.c | 2 +- > target-alpha/cpu-qom.h | 2 +- > target-alpha/cpu.h | 8 +- > target-alpha/fpu_helper.c | 2 +- > target-alpha/helper.c | 2 +- > target-alpha/helper.h | 4 +- > target-alpha/int_helper.c | 2 +- > target-alpha/mem_helper.c | 10 +- > target-alpha/sys_helper.c | 4 +- > target-alpha/translate.c | 8 +- > target-arm/arm-semi.c | 4 +- > target-arm/cpu-qom.h | 2 +- > target-arm/cpu.c | 2 +- > target-arm/cpu.h | 8 +- > target-arm/helper.c | 8 +- > target-arm/helper.h | 4 +- > target-arm/iwmmxt_helper.c | 2 +- > target-arm/neon_helper.c | 2 +- > target-arm/op_helper.c | 10 +- > target-arm/translate.c | 6 +- > target-cris/cpu-qom.h | 2 +- > target-cris/cpu.h | 6 +- > target-cris/crisv32-decode.h | 4 + > target-cris/helper.c | 2 +- > target-cris/helper.h | 4 +- > target-cris/op_helper.c | 12 +- > target-cris/translate.c | 4 +- > target-i386/arch_dump.c | 4 +- > target-i386/arch_memory_mapping.c | 4 +- > target-i386/cpu-qom.h | 4 +- > target-i386/cpu.c | 13 +- > target-i386/cpu.h | 8 +- > target-i386/excp_helper.c | 4 +- > target-i386/fpu_helper.c | 2 +- > target-i386/helper.c | 6 +- > target-i386/helper.h | 4 +- > target-i386/int_helper.c | 2 +- > target-i386/ioport-user.c | 2 +- > target-i386/kvm.c | 13 +- > target-i386/kvm_i386.h | 2 +- > target-i386/machine.c | 2 +- > target-i386/mem_helper.c | 10 +- > target-i386/misc_helper.c | 4 +- > target-i386/seg_helper.c | 4 +- > target-i386/svm_helper.c | 4 +- > target-i386/translate.c | 4 +- > target-lm32/cpu-qom.h | 2 +- > target-lm32/cpu.h | 6 +- > target-lm32/helper.c | 2 +- > target-lm32/helper.h | 4 +- > target-lm32/op_helper.c | 10 +- > target-lm32/translate.c | 4 +- > target-m68k/cpu-qom.h | 2 +- > target-m68k/cpu.h | 8 +- > target-m68k/helper.c | 2 +- > target-m68k/helpers.h | 4 +- > target-m68k/m68k-semi.c | 6 +- > target-m68k/op_helper.c | 10 +- > target-m68k/translate.c | 6 +- > target-microblaze/cpu-qom.h | 2 +- > target-microblaze/cpu.h | 8 +- > target-microblaze/helper.c | 4 +- > target-microblaze/helper.h | 4 +- > target-microblaze/op_helper.c | 12 +- > target-microblaze/translate.c | 4 +- > target-mips/cpu-qom.h | 2 +- > target-mips/cpu.h | 8 +- > target-mips/helper.h | 4 +- > target-mips/op_helper.c | 12 +- > target-mips/translate.c | 4 +- > target-openrisc/cpu.h | 12 +- > target-openrisc/helper.h | 4 +- > target-openrisc/int_helper.c | 2 +- > target-openrisc/interrupt.c | 4 +- > target-openrisc/mmu.c | 4 +- > target-openrisc/mmu_helper.c | 10 +- > target-openrisc/translate.c | 10 +- > target-ppc/cpu-qom.h | 2 +- > target-ppc/cpu.h | 8 +- > target-ppc/helper.c | 4 +- > target-ppc/helper.h | 4 +- > target-ppc/int_helper.c | 2 +- > target-ppc/kvm.c | 10 +- > target-ppc/kvm_ppc.c | 4 +- > target-ppc/kvm_ppc.h | 2 +- > target-ppc/machine.c | 2 +- > target-ppc/mem_helper.c | 12 +- > target-ppc/mmu_helper.c | 2 +- > target-ppc/translate.c | 6 +- > target-ppc/translate_init.c | 8 +- > target-s390x/cpu-qom.h | 2 +- > target-s390x/cpu.c | 2 +- > target-s390x/cpu.h | 8 +- > target-s390x/fpu_helper.c | 2 +- > target-s390x/helper.c | 6 +- > target-s390x/helper.h | 4 +- > target-s390x/int_helper.c | 2 +- > target-s390x/interrupt.c | 2 +- > target-s390x/kvm.c | 8 +- > target-s390x/mem_helper.c | 10 +- > target-s390x/misc_helper.c | 12 +- > target-s390x/translate.c | 6 +- > target-sh4/cpu-qom.h | 2 +- > target-sh4/cpu.h | 10 +- > target-sh4/helper.h | 4 +- > target-sh4/op_helper.c | 10 +- > target-sh4/translate.c | 4 +- > target-sparc/cpu-qom.h | 2 +- > target-sparc/cpu.h | 10 +- > target-sparc/helper.c | 4 +- > target-sparc/helper.h | 4 +- > target-sparc/int32_helper.c | 2 +- > target-sparc/ldst_helper.c | 10 +- > target-sparc/machine.c | 2 +- > target-sparc/mmu_helper.c | 2 +- > target-sparc/translate.c | 4 +- > target-unicore32/cpu-qom.h | 2 +- > target-unicore32/cpu.h | 8 +- > target-unicore32/helper.c | 6 +- > target-unicore32/helper.h | 4 +- > target-unicore32/op_helper.c | 8 +- > target-unicore32/translate.c | 6 +- > target-xtensa/core-dc232b.c | 6 +- > target-xtensa/core-dc233c.c | 6 +- > target-xtensa/core-fsf.c | 6 +- > target-xtensa/cpu-qom.h | 2 +- > target-xtensa/cpu.h | 6 +- > target-xtensa/helper.c | 6 +- > target-xtensa/helper.h | 4 +- > target-xtensa/op_helper.c | 10 +- > target-xtensa/translate.c | 10 +- > target-xtensa/xtensa-semi.c | 2 +- > tcg/arm/tcg-target.c | 2 +- > tcg/arm/tcg-target.h | 3 + > tcg/hppa/tcg-target.c | 2 +- > tcg/hppa/tcg-target.h | 3 + > tcg/i386/tcg-target.c | 2 +- > tcg/i386/tcg-target.h | 3 + > tcg/ia64/tcg-target.c | 2 +- > tcg/ia64/tcg-target.h | 3 + > tcg/mips/tcg-target.c | 2 +- > tcg/mips/tcg-target.h | 3 + > tcg/ppc/tcg-target.c | 2 +- > tcg/ppc/tcg-target.h | 3 + > tcg/ppc64/tcg-target.c | 2 +- > tcg/ppc64/tcg-target.h | 3 + > tcg/s390/tcg-target.c | 2 +- > tcg/s390/tcg-target.h | 3 + > tcg/sparc/tcg-target.c | 2 +- > tcg/sparc/tcg-target.h | 3 + > tcg/tcg.c | 6 +- > tci.c | 2 +- > tests/check-qdict.c | 6 +- > tests/check-qfloat.c | 2 +- > tests/check-qint.c | 2 +- > tests/check-qjson.c | 14 +- > tests/check-qlist.c | 4 +- > tests/check-qstring.c | 2 +- > tests/libqtest.c | 4 +- > tests/tcg/cris/crisutils.h | 5 + > tests/tcg/test-i386-fprem.c | 4 +- > tests/tcg/test-i386.c | 2 +- > tests/test-aio.c | 2 +- > tests/test-coroutine.c | 2 +- > tests/test-iov.c | 4 +- > tests/test-qmp-commands.c | 6 +- > tests/test-qmp-input-strict.c | 2 +- > tests/test-qmp-input-visitor.c | 2 +- > tests/test-qmp-output-visitor.c | 2 +- > tests/test-string-input-visitor.c | 2 +- > tests/test-string-output-visitor.c | 2 +- > tests/test-thread-pool.c | 6 +- > tests/test-visitor-serialization.c | 2 +- > thread-pool.c | 14 +- > thunk.c | 2 +- > trace/simple.c | 2 +- > translate-all.c | 10 +- > ui/Makefile.objs | 7 +- > ui/cocoa.m | 4 +- > console.c => ui/console.c | 5 +- > ui/curses.c | 4 +- > ui/curses_keys.h | 5 + > cursor.c => ui/cursor.c | 2 +- > cursor_hidden.xpm => ui/cursor_hidden.xpm | 0 > cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm | 0 > ui/d3des.h | 4 + > input.c => ui/input.c | 9 +- > ui/keymaps.c | 2 +- > qemu-pixman.c => ui/qemu-pixman.c | 2 +- > qemu-x509.h => ui/qemu-x509.h | 0 > ui/sdl.c | 4 +- > ui/sdl_zoom.c | 2 +- > ui/spice-core.c | 28 +- > ui/spice-display.c | 14 +- > ui/spice-input.c | 4 +- > vgafont.h => ui/vgafont.h | 0 > ui/vnc-auth-sasl.h | 2 +- > ui/vnc-enc-tight.c | 4 +- > ui/vnc-jobs.c | 2 +- > ui/vnc-palette.h | 4 +- > ui/vnc-tls.c | 2 +- > ui/vnc-tls.h | 2 +- > ui/vnc.c | 12 +- > ui/vnc.h | 10 +- > uri.c | 2 +- > user-exec.c | 2 +- > vl.c | 54 +-- > xen-all.c | 8 +- > xen-mapcache.c | 6 +- > xen-stub.c | 2 +- > 1124 files changed, 3142 insertions(+), 3427 deletions(-) > delete mode 100644 Makefile.dis > delete mode 100644 Makefile.user > delete mode 100644 a.out.h > delete mode 100644 bt-host.h > create mode 100644 disas/Makefile.objs > rename alpha-dis.c => disas/alpha.c (99%) > rename arm-dis.c => disas/arm.c (99%) > rename cris-dis.c => disas/cris.c (99%) > rename hppa-dis.c => disas/hppa.c (99%) > rename i386-dis.c => disas/i386.c (99%) > rename ia64-dis.c => disas/ia64.c (99%) > rename lm32-dis.c => disas/lm32.c (99%) > rename m68k-dis.c => disas/m68k.c (99%) > rename microblaze-dis.c => disas/microblaze.c (99%) > rename mips-dis.c => disas/mips.c (99%) > rename ppc-dis.c => disas/ppc.c (99%) > rename s390-dis.c => disas/s390.c (99%) > rename sh4-dis.c => disas/sh4.c (99%) > rename sparc-dis.c => disas/sparc.c (99%) > rename tci-dis.c => disas/tci.c (98%) > create mode 100644 hw/pci/Makefile.objs > rename hw/{ => pci}/msi.c (99%) > rename hw/{ => pci}/msi.h (98%) > rename hw/{ => pci}/msix.c (99%) > rename hw/{ => pci}/msix.h (98%) > rename hw/{ => pci}/pci-hotplug.c (96%) > rename hw/{ => pci}/pci-stub.c (94%) > rename hw/{ => pci}/pci.c (99%) > rename hw/{ => pci}/pci.h (99%) > rename hw/{ => pci}/pci_bridge.c (99%) > rename hw/{ => pci}/pci_bridge.h (98%) > rename hw/{pci_internals.h => pci/pci_bus.h} (79%) > rename hw/{ => pci}/pci_host.c (99%) > rename hw/{ => pci}/pci_host.h (99%) > rename hw/{ => pci}/pci_ids.h (98%) > rename hw/{ => pci}/pci_regs.h (100%) > rename hw/{ => pci}/pcie.c (99%) > rename hw/{ => pci}/pcie.h (98%) > rename hw/{ => pci}/pcie_aer.c (99%) > rename hw/{ => pci}/pcie_aer.h (99%) > rename hw/{ => pci}/pcie_host.c (97%) > rename hw/{ => pci}/pcie_host.h (96%) > rename hw/{ => pci}/pcie_port.c (99%) > rename hw/{ => pci}/pcie_port.h (96%) > rename hw/{ => pci}/pcie_regs.h (100%) > rename hw/{ => pci}/shpc.c (99%) > rename hw/{ => pci}/shpc.h (95%) > rename hw/{ => pci}/slotid_cap.c (95%) > rename hw/{ => pci}/slotid_cap.h (100%) > rename uboot_image.h => hw/uboot_image.h (100%) > rename aes.h => include/block/aes.h (100%) > rename qemu-aio.h => include/block/aio.h (99%) > rename block.h => include/block/block.h (99%) > rename block_int.h => include/block/block_int.h (98%) > rename blockjob.h => include/block/blockjob.h (99%) > rename qemu-coroutine.h => include/block/coroutine.h (99%) > rename qemu-coroutine-int.h => include/block/coroutine_int.h (96%) > rename nbd.h => include/block/nbd.h (100%) > rename thread-pool.h => include/block/thread-pool.h (88%) > create mode 100644 include/bt/bt.h > rename qemu-char.h => include/char/char.h (97%) > rename config.h => include/config.h (100%) > rename dis-asm.h => include/disas/bfd.h (100%) > rename disas.h => include/disas/disas.h (100%) > rename elf.h => include/elf.h (100%) > rename exec-memory.h => include/exec/address-spaces.h (97%) > rename cpu-all.h => include/exec/cpu-all.h (99%) > rename cpu-common.h => include/exec/cpu-common.h (97%) > rename cpu-defs.h => include/exec/cpu-defs.h (99%) > rename cputlb.h => include/exec/cputlb.h (100%) > rename def-helper.h => include/exec/def-helper.h (100%) > rename exec-all.h => include/exec/exec-all.h (98%) > rename gdbstub.h => include/exec/gdbstub.h (100%) > rename gen-icount.h => include/exec/gen-icount.h (94%) > rename hwaddr.h => include/exec/hwaddr.h (100%) > rename ioport.h => include/exec/ioport.h (99%) > rename iorange.h => include/exec/iorange.h (100%) > rename memory-internal.h => include/exec/memory-internal.h (100%) > rename memory.h => include/exec/memory.h (99%) > rename poison.h => include/exec/poison.h (100%) > rename softmmu-semi.h => include/exec/softmmu-semi.h (97%) > rename softmmu_defs.h => include/exec/softmmu_defs.h (100%) > rename softmmu_exec.h => include/exec/softmmu_exec.h (72%) > rename softmmu_header.h => include/exec/softmmu_header.h (100%) > rename softmmu_template.h => include/exec/softmmu_template.h (99%) > rename qemu-lock.h => include/exec/spinlock.h (100%) > rename qemu-user-types.h => include/exec/user/abitypes.h (100%) > rename thunk.h => include/exec/user/thunk.h (100%) > rename {fpu => include/fpu}/softfloat.h (99%) > rename libfdt_env.h => include/libfdt_env.h (97%) > rename block-migration.h => include/migration/block.h (100%) > rename migration.h => include/migration/migration.h (97%) > rename include/{qemu => migration}/page_cache.h (100%) > rename qemu-file.h => include/migration/qemu-file.h (100%) > rename vmstate.h => include/migration/vmstate.h (100%) > rename monitor.h => include/monitor/monitor.h (96%) > rename readline.h => include/monitor/readline.h (100%) > rename {net => include/net}/checksum.h (100%) > rename net.h => include/net/net.h (90%) > rename {net => include/net}/queue.h (100%) > rename {net => include/net}/slirp.h (96%) > create mode 100644 include/net/tap.h > rename qapi/qapi-dealloc-visitor.h => include/qapi/dealloc-visitor.h (95%) > rename error.h => include/qapi/error.h (98%) > rename {qapi => include/qapi}/opts-visitor.h (93%) > rename {qapi => include/qapi}/qmp-input-visitor.h (91%) > rename {qapi => include/qapi}/qmp-output-visitor.h (91%) > rename qapi/qmp-core.h => include/qapi/qmp/dispatch.h (93%) > rename json-lexer.h => include/qapi/qmp/json-lexer.h (94%) > rename json-parser.h => include/qapi/qmp/json-parser.h (90%) > rename json-streamer.h => include/qapi/qmp/json-streamer.h (93%) > rename qbool.h => include/qapi/qmp/qbool.h (94%) > rename qdict.h => include/qapi/qmp/qdict.h (96%) > rename qerror.h => include/qapi/qmp/qerror.h (98%) > rename qfloat.h => include/qapi/qmp/qfloat.h (94%) > rename qint.h => include/qapi/qmp/qint.h (94%) > rename qjson.h => include/qapi/qmp/qjson.h (88%) > rename qlist.h => include/qapi/qmp/qlist.h (95%) > rename qobject.h => include/qapi/qmp/qobject.h (100%) > rename qstring.h => include/qapi/qmp/qstring.h (96%) > rename qemu-objects.h => include/qapi/qmp/types.h (60%) > rename {qapi => include/qapi}/string-input-visitor.h (95%) > rename {qapi => include/qapi}/string-output-visitor.h (95%) > create mode 100644 include/qapi/visitor-impl.h > rename qapi/qapi-visit-core.h => include/qapi/visitor.h (52%) > rename qemu-common.h => include/qemu-common.h (98%) > rename acl.h => include/qemu/acl.h (98%) > rename qemu-barrier.h => include/qemu/atomic.h (96%) > rename bitmap.h => include/qemu/bitmap.h (99%) > rename bitops.h => include/qemu/bitops.h (100%) > rename bswap.h => include/qemu/bswap.h (99%) > rename cache-utils.h => include/qemu/cache-utils.h (100%) > rename compatfd.h => include/qemu/compatfd.h (100%) > rename compiler.h => include/qemu/compiler.h (100%) > rename qemu-config.h => include/qemu/config-file.h (91%) > rename envlist.h => include/qemu/envlist.h (100%) > rename qemu-error.h => include/qemu/error-report.h (100%) > rename event_notifier.h => include/qemu/event_notifier.h (100%) > rename host-utils.h => include/qemu/host-utils.h (98%) > rename int128.h => include/qemu/int128.h (100%) > rename iov.h => include/qemu/iov.h (99%) > rename qemu-log.h => include/qemu/log.h (99%) > rename main-loop.h => include/qemu/main-loop.h (99%) > rename module.h => include/qemu/module.h (100%) > rename notify.h => include/qemu/notify.h (97%) > rename qemu-option.h => include/qemu/option.h (98%) > rename qemu-option-internal.h => include/qemu/option_int.h (96%) > rename osdep.h => include/qemu/osdep.h (100%) > rename qemu-queue.h => include/qemu/queue.h (99%) > rename range.h => include/qemu/range.h (100%) > rename qemu_socket.h => include/qemu/sockets.h (96%) > rename qemu-thread-posix.h => include/qemu/thread-posix.h (100%) > rename qemu-thread-win32.h => include/qemu/thread-win32.h (100%) > rename qemu-thread.h => include/qemu/thread.h (96%) > rename qemu-timer.h => include/qemu/timer.h (99%) > rename qemu-tls.h => include/qemu/tls.h (100%) > rename qemu-types.h => include/qemu/typedefs.h (100%) > rename uri.h => include/qemu/uri.h (100%) > rename qemu-xattr.h => include/qemu/xattr.h (100%) > rename include/{qemu => qom}/cpu.h (98%) > rename include/{qemu => qom}/object.h (99%) > rename include/{qemu => qom}/qom-qobject.h (97%) > rename arch_init.h => include/sysemu/arch_init.h (100%) > rename balloon.h => include/sysemu/balloon.h (95%) > rename blockdev.h => include/sysemu/blockdev.h (96%) > rename cpus.h => include/sysemu/cpus.h (100%) > rename device_tree.h => include/sysemu/device_tree.h (100%) > rename dma.h => include/sysemu/dma.h (99%) > rename dump.h => include/sysemu/dump.h (100%) > rename kvm.h => include/sysemu/kvm.h (99%) > rename memory_mapping.h => include/sysemu/memory_mapping.h (98%) > rename qemu-os-posix.h => include/sysemu/os-posix.h (100%) > rename qemu-os-win32.h => include/sysemu/os-win32.h (100%) > rename qtest.h => include/sysemu/qtest.h (100%) > rename qemu-seccomp.h => include/sysemu/seccomp.h (95%) > rename sysemu.h => include/sysemu/sysemu.h (97%) > rename xen-mapcache.h => include/sysemu/xen-mapcache.h (100%) > rename console.h => include/ui/console.h (99%) > rename {hw => include/ui}/pixel_ops.h (100%) > rename qemu-pixman.h => include/ui/qemu-pixman.h (100%) > rename {ui => include/ui}/qemu-spice.h (95%) > rename {ui => include/ui}/spice-display.h (98%) > rename alpha.ld => ldscripts/alpha.ld (100%) > rename arm.ld => ldscripts/arm.ld (100%) > rename hppa.ld => ldscripts/hppa.ld (100%) > rename i386.ld => ldscripts/i386.ld (100%) > rename ia64.ld => ldscripts/ia64.ld (100%) > rename m68k.ld => ldscripts/m68k.ld (100%) > rename mips.ld => ldscripts/mips.ld (100%) > rename ppc.ld => ldscripts/ppc.ld (100%) > rename ppc64.ld => ldscripts/ppc64.ld (100%) > rename s390.ld => ldscripts/s390.ld (100%) > rename sparc.ld => ldscripts/sparc.ld (100%) > rename sparc64.ld => ldscripts/sparc64.ld (100%) > rename x86_64.ld => ldscripts/x86_64.ld (100%) > rename net.c => net/net.c (99%) > rename net/{tap.h => tap_int.h} (77%) > delete mode 100644 qapi/qapi-types-core.h > delete mode 100644 qapi/qapi-visit-impl.h > rename qemu-ga.c => qga/main.c (99%) > rename qapi-schema-guest.json => qga/qapi-schema.json (100%) > rename console.c => ui/console.c (99%) > rename cursor.c => ui/cursor.c (99%) > rename cursor_hidden.xpm => ui/cursor_hidden.xpm (100%) > rename cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm (100%) > rename input.c => ui/input.c (99%) > rename qemu-pixman.c => ui/qemu-pixman.c (98%) > rename qemu-x509.h => ui/qemu-x509.h (100%) > rename vgafont.h => ui/vgafont.h (100%) > --- > 1.8.0.2
Il 18/12/2012 21:59, Anthony Liguori ha scritto: > But this series breaks the build of make check. It's not just one test > case but almost every single one. I think you must have eliminated an > implicit include of qemu-common.h which makes PRId64 et al all > undeclared. > > I started fixing this too but it became too much for a merge commit > since it affects almost all tests. > > Can you fixup make check and send this series out? I'll make sure to > check tomorrow and merge your pull request if I see it tomorrow. > Otherwise, let me know when you plan on sending it and I'll make sure to > be available to merge it. Hmm, I must have pushed the wrong branch because I remember this failure. Paolo
Ok... I had really merged the wrong branch with mst's. I fixed it up and pushed again to the same place; it's now commit 6cdf60e, "make check" builds and passes. Here is the diff, sorry for the mistake. Paolo On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote: > Il 18/12/2012 21:59, Anthony Liguori ha scritto: > > But this series breaks the build of make check. It's not just one test > > case but almost every single one. I think you must have eliminated an > > implicit include of qemu-common.h which makes PRId64 et al all > > undeclared. > > > > I started fixing this too but it became too much for a merge commit > > since it affects almost all tests. > > > > Can you fixup make check and send this series out? I'll make sure to > > check tomorrow and merge your pull request if I see it tomorrow. > > Otherwise, let me know when you plan on sending it and I'll make sure to > > be available to merge it. > > Hmm, I must have pushed the wrong branch because I remember this failure. > > Paolo >
And how does it conflicts with Alex's ppc pull request? It is a fast forward from origin/master as of now (commit a8a826a, exec: refactor cpu_restore_state, 2012-12-04), and that includes Alex's commits... Paolo On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote: > Il 18/12/2012 21:59, Anthony Liguori ha scritto: > > But this series breaks the build of make check. It's not just one test > > case but almost every single one. I think you must have eliminated an > > implicit include of qemu-common.h which makes PRId64 et al all > > undeclared. > > > > I started fixing this too but it became too much for a merge commit > > since it affects almost all tests. > > > > Can you fixup make check and send this series out? I'll make sure to > > check tomorrow and merge your pull request if I see it tomorrow. > > Otherwise, let me know when you plan on sending it and I'll make sure to > > be available to merge it. > > Hmm, I must have pushed the wrong branch because I remember this failure. > > Paolo >
Paolo Bonzini <pbonzini@redhat.com> writes: > Ok... I had really merged the wrong branch with mst's. I fixed it up and > pushed again to the same place; it's now commit 6cdf60e, "make check" > builds and passes. > > Here is the diff, sorry for the mistake. No problem. I'm processing other pull requests now but will merged this one tonight after I push the others. Michael, I'll still plan on merging your changes through this request so I won't be processing your pinged pull request since Paolo's contains yours. Regards, Anthony Liguori > > Paolo > > > On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote: > >> Il 18/12/2012 21:59, Anthony Liguori ha scritto: >> > But this series breaks the build of make check. It's not just one test >> > case but almost every single one. I think you must have eliminated an >> > implicit include of qemu-common.h which makes PRId64 et al all >> > undeclared. >> > >> > I started fixing this too but it became too much for a merge commit >> > since it affects almost all tests. >> > >> > Can you fixup make check and send this series out? I'll make sure to >> > check tomorrow and merge your pull request if I see it tomorrow. >> > Otherwise, let me know when you plan on sending it and I'll make sure to >> > be available to merge it. >> >> Hmm, I must have pushed the wrong branch because I remember this failure. >> >> Paolo >>
Paolo Bonzini <pbonzini@redhat.com> writes: > And how does it conflicts with Alex's ppc pull request? It is a fast > forward from origin/master as of now (commit a8a826a, exec: refactor > cpu_restore_state, 2012-12-04), and that includes Alex's commits... Something from the e500 changes because hw/ppc/e500.c and hw/ppc/e500plat.c broke after the merge. But since it was the wrong tree, maybe your new branch will not have this problem. It was easy to fix, so don't worry about it. I can resolve as a merge conflict if needed. Regards, Anthony Liguori > > Paolo > > > > On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote: > >> Il 18/12/2012 21:59, Anthony Liguori ha scritto: >> > But this series breaks the build of make check. It's not just one test >> > case but almost every single one. I think you must have eliminated an >> > implicit include of qemu-common.h which makes PRId64 et al all >> > undeclared. >> > >> > I started fixing this too but it became too much for a merge commit >> > since it affects almost all tests. >> > >> > Can you fixup make check and send this series out? I'll make sure to >> > check tomorrow and merge your pull request if I see it tomorrow. >> > Otherwise, let me know when you plan on sending it and I'll make sure to >> > be available to merge it. >> >> Hmm, I must have pushed the wrong branch because I remember this failure. >> >> Paolo >>
On Tue, Dec 18, 2012 at 04:35:53PM -0600, Anthony Liguori wrote: > Paolo Bonzini <pbonzini@redhat.com> writes: > > > Ok... I had really merged the wrong branch with mst's. I fixed it up and > > pushed again to the same place; it's now commit 6cdf60e, "make check" > > builds and passes. > > > > Here is the diff, sorry for the mistake. > > No problem. I'm processing other pull requests now but will merged this > one tonight after I push the others. > > Michael, I'll still plan on merging your changes through this request so > I won't be processing your pinged pull request since Paolo's contains yours. > > Regards, > > Anthony Liguori This is painful - I hoped for fast merge to reduce conflicts :(. I already got some patches submitted on list that don't apply on my tree. > > > > Paolo > > > > > > On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote: > > > >> Il 18/12/2012 21:59, Anthony Liguori ha scritto: > >> > But this series breaks the build of make check. It's not just one test > >> > case but almost every single one. I think you must have eliminated an > >> > implicit include of qemu-common.h which makes PRId64 et al all > >> > undeclared. > >> > > >> > I started fixing this too but it became too much for a merge commit > >> > since it affects almost all tests. > >> > > >> > Can you fixup make check and send this series out? I'll make sure to > >> > check tomorrow and merge your pull request if I see it tomorrow. > >> > Otherwise, let me know when you plan on sending it and I'll make sure to > >> > be available to merge it. > >> > >> Hmm, I must have pushed the wrong branch because I remember this failure. > >> > >> Paolo > >>
"Michael S. Tsirkin" <mst@redhat.com> writes: > On Tue, Dec 18, 2012 at 04:35:53PM -0600, Anthony Liguori wrote: >> Paolo Bonzini <pbonzini@redhat.com> writes: >> >> > Ok... I had really merged the wrong branch with mst's. I fixed it up and >> > pushed again to the same place; it's now commit 6cdf60e, "make check" >> > builds and passes. >> > >> > Here is the diff, sorry for the mistake. >> >> No problem. I'm processing other pull requests now but will merged this >> one tonight after I push the others. >> >> Michael, I'll still plan on merging your changes through this request so >> I won't be processing your pinged pull request since Paolo's contains yours. >> >> Regards, >> >> Anthony Liguori > > This is painful - I hoped for fast merge to reduce conflicts :(. Uh, your pull request didn't build so that pretty much eliminates the possibility of a fast merge. It'll get pushed today. It's next inline after the current test run completes. Regards, Anthony Liguori > I already got some patches submitted on list that don't apply on my tree. > >> > >> > Paolo >> > >> > >> > On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote: >> > >> >> Il 18/12/2012 21:59, Anthony Liguori ha scritto: >> >> > But this series breaks the build of make check. It's not just one test >> >> > case but almost every single one. I think you must have eliminated an >> >> > implicit include of qemu-common.h which makes PRId64 et al all >> >> > undeclared. >> >> > >> >> > I started fixing this too but it became too much for a merge commit >> >> > since it affects almost all tests. >> >> > >> >> > Can you fixup make check and send this series out? I'll make sure to >> >> > check tomorrow and merge your pull request if I see it tomorrow. >> >> > Otherwise, let me know when you plan on sending it and I'll make sure to >> >> > be available to merge it. >> >> >> >> Hmm, I must have pushed the wrong branch because I remember this failure. >> >> >> >> Paolo >> >>
Il 18/12/2012 23:39, Anthony Liguori ha scritto: >> > And how does it conflicts with Alex's ppc pull request? It is a fast >> > forward from origin/master as of now (commit a8a826a, exec: refactor >> > cpu_restore_state, 2012-12-04), and that includes Alex's commits... > Something from the e500 changes because hw/ppc/e500.c and > hw/ppc/e500plat.c broke after the merge. > > But since it was the wrong tree, maybe your new branch will not have > this problem. > > It was easy to fix, so don't worry about it. I can resolve as a merge > conflict if needed. Pushed. Paolo
Paolo Bonzini <pbonzini@redhat.com> writes: > Anthony, > > The following changes since commit a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0: > > exec: refactor cpu_restore_state (2012-12-16 08:35:24 +0000) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git header-dirs > > for you to fetch changes up to 394394a788cec72682750f855e5182de156026b4: > > janitor: move remaining public headers to include/ (2012-12-17 > 18:56:58 +0100) Pulled. Thanks. Regards, Anthony Liguori > > ---------------------------------------------------------------- > Jason Baron (1): > Fixup q35/ich9 Licenses > > Michael S. Tsirkin (12): > tap: reset vnet header size on open > get_maintainer.pl: update from linix 3.8 > pci: prepare makefiles for pci code reorganization > MAINTAINERS: add hw/pci/ to list of PCI files > pci: move pci core code to hw/pci > pci: update all users to look in pci/ > pci: fix path for local includes > Revert "pci: prepare makefiles for pci code reorganization" > pci: rename pci_internals.h pci_bus.h > pci_bus: update comment > pci_bus.h: tweak include guards > kvm: do not flush after deleting gsi > > Paolo Bonzini (33): > Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD > libcacard: simplify rules for recursive build > vscclient: use per-target variables > build: adjust setting of QEMU_INCLUDES > build: add $(TARGET_DIR) to "GEN config-target.h" lines > build: move rules from Makefile to */Makefile.objs > build: create ldscripts/ > build: kill libdis, move disassemblers to disas/ > build: kill libuser > janitor: do not rely on indirect inclusions of or from qemu-char.h > janitor: do not include qemu-char everywhere > net: move Bluetooth stuff out of net.h > net: do not include net.h everywhere > net: move net.c to net/ > net: reorganize headers > qemu-ga: move qemu-ga files to qga/ > ui: move files to ui/ and include/ui/ > qapi: move inclusions of qemu-common.h from headers to .c files > qapi: remove qapi/qapi-types-core.h > qapi: make struct Visitor opaque > janitor: add guards to headers > qapi: move include files to include/qobject/ > block: move include files to include/block/ > exec: move include files to include/exec/ > monitor: move include files to include/monitor/ > migration: move include files to include/migration/ > qom: move include files to include/qom/ > misc: move include files to include/qemu/ > softmmu: move include files to include/sysemu/ > softmmu: move remaining include files to include/ subdirectories > fpu: move public header file to include/fpu > hw: move executable format header files to hw/ > janitor: move remaining public headers to include/ > > .gitignore | 1 + > MAINTAINERS | 1 + > Makefile | 47 +-- > Makefile.dis | 20 - > Makefile.objs | 32 +- > Makefile.target | 8 +- > Makefile.user | 24 -- > a.out.h | 430 --------------------- > acl.c | 2 +- > aes.c | 2 +- > aio-posix.c | 6 +- > aio-win32.c | 6 +- > arch_init.c | 24 +- > async.c | 4 +- > audio/Makefile.objs | 3 + > audio/alsaaudio.c | 2 +- > audio/audio.c | 6 +- > audio/audio.h | 2 +- > audio/noaudio.c | 2 +- > audio/ossaudio.c | 4 +- > audio/spiceaudio.c | 2 +- > audio/wavaudio.c | 2 +- > audio/wavcapture.c | 2 +- > audio/winwaveaudio.c | 2 +- > backends/rng-egd.c | 4 +- > backends/rng-random.c | 4 +- > backends/rng.c | 2 +- > balloon.c | 10 +- > bitmap.c | 4 +- > bitops.c | 2 +- > block-migration.c | 12 +- > block.c | 18 +- > block/Makefile.objs | 2 + > block/blkdebug.c | 5 +- > block/blkverify.c | 4 +- > block/bochs.c | 4 +- > block/cloop.c | 4 +- > block/commit.c | 4 +- > block/cow.c | 4 +- > block/curl.c | 2 +- > block/dmg.c | 6 +- > block/gluster.c | 6 +- > block/iscsi.c | 5 +- > block/linux-aio.c | 6 +- > block/mirror.c | 4 +- > block/nbd.c | 10 +- > block/parallels.c | 4 +- > block/qcow.c | 8 +- > block/qcow2-cache.c | 2 +- > block/qcow2-cluster.c | 2 +- > block/qcow2-refcount.c | 2 +- > block/qcow2-snapshot.c | 2 +- > block/qcow2.c | 10 +- > block/qcow2.h | 4 +- > block/qed-table.c | 2 +- > block/qed.c | 6 +- > block/qed.h | 2 +- > block/raw-posix.c | 13 +- > block/raw-win32.c | 10 +- > block/raw.c | 4 +- > block/rbd.c | 4 +- > block/sheepdog.c | 8 +- > block/stream.c | 4 +- > block/vdi.c | 8 +- > block/vmdk.c | 6 +- > block/vpc.c | 6 +- > block/vvfat.c | 6 +- > block/win32-aio.c | 10 +- > blockdev-nbd.c | 12 +- > blockdev.c | 20 +- > blockjob.c | 14 +- > bsd-user/elfload.c | 2 +- > bsd-user/main.c | 4 +- > bsd-user/qemu.h | 6 +- > bt-host.c | 5 +- > bt-host.h | 9 - > bt-vhci.c | 4 +- > buffered_file.c | 3 +- > buffered_file.h | 2 +- > cache-utils.c | 2 +- > cmd.c | 4 +- > compatfd.c | 2 +- > configure | 53 +-- > coroutine-gthread.c | 2 +- > coroutine-sigaltstack.c | 2 +- > coroutine-ucontext.c | 2 +- > coroutine-win32.c | 2 +- > cpu-exec.c | 6 +- > cpus.c | 22 +- > cputlb.c | 18 +- > cutils.c | 6 +- > device_tree.c | 6 +- > disas.c | 6 +- > disas/Makefile.objs | 16 + > alpha-dis.c => disas/alpha.c | 2 +- > arm-dis.c => disas/arm.c | 2 +- > cris-dis.c => disas/cris.c | 2 +- > hppa-dis.c => disas/hppa.c | 2 +- > i386-dis.c => disas/i386.c | 2 +- > ia64-dis.c => disas/ia64.c | 2 +- > lm32-dis.c => disas/lm32.c | 2 +- > m68k-dis.c => disas/m68k.c | 2 +- > microblaze-dis.c => disas/microblaze.c | 2 +- > mips-dis.c => disas/mips.c | 2 +- > ppc-dis.c => disas/ppc.c | 2 +- > s390-dis.c => disas/s390.c | 2 +- > sh4-dis.c => disas/sh4.c | 2 +- > sparc-dis.c => disas/sparc.c | 2 +- > tci-dis.c => disas/tci.c | 2 +- > dma-helpers.c | 6 +- > dump-stub.c | 4 +- > dump.c | 18 +- > envlist.c | 4 +- > error.c | 8 +- > event_notifier-posix.c | 5 +- > event_notifier-win32.c | 4 +- > exec.c | 19 +- > fpu/softfloat.c | 2 +- > fsdev/qemu-fsdev-dummy.c | 4 +- > fsdev/qemu-fsdev.c | 6 +- > fsdev/qemu-fsdev.h | 2 +- > fsdev/virtfs-proxy-helper.c | 4 +- > fsdev/virtio-9p-marshal.c | 4 +- > gdbstub.c | 12 +- > hmp.c | 13 +- > hmp.h | 2 +- > host-utils.c | 2 +- > hw/9pfs/codir.c | 4 +- > hw/9pfs/cofile.c | 4 +- > hw/9pfs/cofs.c | 4 +- > hw/9pfs/coxattr.c | 4 +- > hw/9pfs/virtio-9p-coth.c | 5 +- > hw/9pfs/virtio-9p-coth.h | 4 +- > hw/9pfs/virtio-9p-device.c | 2 +- > hw/9pfs/virtio-9p-handle.c | 2 +- > hw/9pfs/virtio-9p-local.c | 2 +- > hw/9pfs/virtio-9p-posix-acl.c | 2 +- > hw/9pfs/virtio-9p-synth.h | 4 + > hw/9pfs/virtio-9p-xattr.h | 2 +- > hw/9pfs/virtio-9p.c | 4 +- > hw/9pfs/virtio-9p.h | 4 +- > hw/Makefile.objs | 15 +- > hw/ac97.c | 4 +- > hw/acpi.c | 4 +- > hw/acpi.h | 2 +- > hw/acpi_ich9.c | 23 +- > hw/acpi_piix4.c | 10 +- > hw/adb.c | 2 +- > hw/adlib.c | 2 +- > hw/ads7846.c | 2 +- > hw/alpha_dp264.c | 2 +- > hw/alpha_pci.c | 4 +- > hw/alpha_sys.h | 5 +- > hw/alpha_typhoon.c | 6 +- > hw/an5206.c | 2 +- > hw/apb_pci.c | 12 +- > hw/apic.c | 6 +- > hw/apic_common.c | 2 +- > hw/apic_internal.h | 4 +- > hw/apm.c | 2 +- > hw/apm.h | 2 +- > hw/applesmc.c | 4 +- > hw/arm-misc.h | 2 +- > hw/arm11mpcore.c | 2 +- > hw/arm_boot.c | 5 +- > hw/arm_mptimer.c | 2 +- > hw/arm_sysctl.c | 4 +- > hw/arm_timer.c | 2 +- > hw/armv7m_nvic.c | 4 +- > hw/audiodev.h | 5 + > hw/axis_dev88.c | 6 +- > hw/baum.c | 4 +- > hw/baum.h | 4 + > hw/blizzard.c | 4 +- > hw/block-common.c | 4 +- > hw/boards.h | 2 +- > hw/bonito.c | 8 +- > hw/bt-hci-csr.c | 6 +- > hw/bt-hci.c | 4 +- > hw/bt-hid.c | 4 +- > hw/bt-l2cap.c | 2 +- > hw/bt.c | 2 +- > hw/bt.h | 5 + > hw/cadence_gem.c | 2 +- > hw/cadence_ttc.c | 2 +- > hw/cadence_uart.c | 4 +- > hw/cbus.c | 2 +- > hw/ccid-card-emulated.c | 6 +- > hw/ccid-card-passthru.c | 6 +- > hw/cirrus_vga.c | 4 +- > hw/collie.c | 4 +- > hw/cris-boot.h | 4 + > hw/cs4231a.c | 2 +- > hw/cuda.c | 4 +- > hw/debugcon.c | 2 +- > hw/dec_pci.c | 8 +- > hw/device-hotplug.c | 9 +- > hw/dma.c | 1 + > hw/dp8393x.c | 4 +- > hw/dummy_m68k.c | 2 +- > hw/e1000.c | 8 +- > hw/eepro100.c | 8 +- > hw/empty_slot.h | 5 + > hw/es1370.c | 4 +- > hw/escc.c | 4 +- > hw/escc.h | 5 + > hw/esp-pci.c | 4 +- > hw/esp.c | 2 +- > hw/etraxfs.h | 7 +- > hw/etraxfs_dma.c | 4 +- > hw/etraxfs_dma.h | 5 + > hw/etraxfs_eth.c | 2 +- > hw/etraxfs_ser.c | 4 +- > hw/etraxfs_timer.c | 4 +- > hw/exynos4210.c | 2 +- > hw/exynos4210.h | 2 +- > hw/exynos4210_fimd.c | 8 +- > hw/exynos4210_i2c.c | 2 +- > hw/exynos4210_mct.c | 2 +- > hw/exynos4210_pwm.c | 2 +- > hw/exynos4210_rtc.c | 6 +- > hw/exynos4210_uart.c | 4 +- > hw/exynos4_boards.c | 6 +- > hw/fdc.c | 10 +- > hw/flash.h | 7 +- > hw/framebuffer.c | 2 +- > hw/framebuffer.h | 2 +- > hw/fw_cfg.c | 5 +- > hw/g364fb.c | 4 +- > hw/grackle_pci.c | 4 +- > hw/grlib_apbuart.c | 2 +- > hw/grlib_gptimer.c | 2 +- > hw/gt64xxx.c | 6 +- > hw/gumstix.c | 6 +- > hw/hd-geometry.c | 2 +- > hw/hda-audio.c | 2 +- > hw/hid.c | 4 +- > hw/hid.h | 2 +- > hw/highbank.c | 8 +- > hw/hpet.c | 4 +- > hw/hw.h | 12 +- > hw/i386/Makefile.objs | 2 +- > hw/i82378.c | 2 +- > hw/i8254.c | 2 +- > hw/i8254_common.c | 2 +- > hw/i8259.c | 4 +- > hw/i82801b11.c | 2 +- > hw/ich9.h | 10 +- > hw/ide.h | 4 +- > hw/ide/ahci.c | 10 +- > hw/ide/cmd646.c | 8 +- > hw/ide/core.c | 12 +- > hw/ide/ich.c | 8 +- > hw/ide/internal.h | 6 +- > hw/ide/isa.c | 4 +- > hw/ide/macio.c | 4 +- > hw/ide/microdrive.c | 4 +- > hw/ide/mmio.c | 4 +- > hw/ide/pci.c | 6 +- > hw/ide/piix.c | 8 +- > hw/ide/qdev.c | 8 +- > hw/ide/via.c | 8 +- > hw/imx_avic.c | 2 +- > hw/imx_ccm.c | 2 +- > hw/imx_serial.c | 4 +- > hw/imx_timer.c | 2 +- > hw/integratorcp.c | 6 +- > hw/intel-hda.c | 8 +- > hw/ioapic_internal.h | 2 +- > hw/ioh3420.c | 6 +- > hw/ioh3420.h | 2 +- > hw/isa-bus.c | 6 +- > hw/isa.h | 4 +- > hw/isa_mmio.c | 2 +- > hw/ivshmem.c | 13 +- > hw/jazz_led.c | 5 +- > hw/kvm/apic.c | 4 +- > hw/kvm/clock.c | 4 +- > hw/kvm/i8254.c | 6 +- > hw/kvm/i8259.c | 2 +- > hw/kvm/ioapic.c | 2 +- > hw/kvm/pci-assign.c | 14 +- > hw/kvmvapic.c | 6 +- > hw/kzm.c | 6 +- > hw/lan9118.c | 4 +- > hw/lance.c | 6 +- > hw/leon3.c | 8 +- > hw/lm32.h | 5 + > hw/lm32_boards.c | 5 +- > hw/lm32_juart.c | 2 +- > hw/lm32_pic.c | 2 +- > hw/lm32_sys.c | 8 +- > hw/lm32_timer.c | 4 +- > hw/lm32_uart.c | 4 +- > hw/lm832x.c | 4 +- > hw/loader.c | 10 +- > hw/lpc_ich9.c | 46 +-- > hw/lsi53c895a.c | 4 +- > hw/m25p80.c | 2 +- > hw/m48t59.c | 6 +- > hw/mac_dbdma.c | 1 + > hw/mac_dbdma.h | 6 +- > hw/mac_nvram.c | 2 +- > hw/macio.c | 2 +- > hw/mainstone.c | 6 +- > hw/mc146818rtc.c | 6 +- > hw/mcf5206.c | 6 +- > hw/mcf5208.c | 8 +- > hw/mcf_fec.c | 4 +- > hw/mcf_intc.c | 2 +- > hw/mcf_uart.c | 4 +- > hw/megasas.c | 8 +- > hw/microblaze_boot.c | 6 +- > hw/milkymist-ac97.c | 2 +- > hw/milkymist-hpdmc.c | 2 +- > hw/milkymist-hw.h | 1 + > hw/milkymist-memcard.c | 6 +- > hw/milkymist-minimac2.c | 4 +- > hw/milkymist-pfpu.c | 4 +- > hw/milkymist-softusb.c | 4 +- > hw/milkymist-sysctl.c | 6 +- > hw/milkymist-tmu2.c | 2 +- > hw/milkymist-uart.c | 4 +- > hw/milkymist-vgafb.c | 6 +- > hw/milkymist.c | 7 +- > hw/mips.h | 2 +- > hw/mips_fulong2e.c | 16 +- > hw/mips_jazz.c | 10 +- > hw/mips_malta.c | 18 +- > hw/mips_mipssim.c | 6 +- > hw/mips_r4k.c | 10 +- > hw/mips_timer.c | 2 +- > hw/mipsnet.c | 2 +- > hw/mpc8544_guts.c | 2 +- > hw/msmouse.c | 6 +- > hw/msmouse.h | 5 + > hw/multiboot.c | 2 +- > hw/musicpal.c | 17 +- > hw/nand.c | 4 +- > hw/ne2000-isa.c | 4 +- > hw/ne2000.c | 6 +- > hw/ne2000.h | 5 + > hw/nseries.c | 8 +- > hw/omap.h | 2 +- > hw/omap1.c | 6 +- > hw/omap2.c | 8 +- > hw/omap_dma.c | 2 +- > hw/omap_dss.c | 2 +- > hw/omap_gpmc.c | 4 +- > hw/omap_gptimer.c | 2 +- > hw/omap_lcdc.c | 5 +- > hw/omap_sx1.c | 6 +- > hw/omap_synctimer.c | 2 +- > hw/omap_uart.c | 4 +- > hw/onenand.c | 8 +- > hw/opencores_eth.c | 4 +- > hw/openpic.c | 4 +- > hw/openrisc_sim.c | 8 +- > hw/openrisc_timer.c | 2 +- > hw/palm.c | 6 +- > hw/pam.c | 2 +- > hw/pam.h | 2 +- > hw/parallel.c | 4 +- > hw/pc.c | 20 +- > hw/pc.h | 8 +- > hw/pc_piix.c | 18 +- > hw/pc_q35.c | 6 +- > hw/pc_sysfw.c | 6 +- > hw/pci/Makefile.objs | 9 + > hw/{ => pci}/msi.c | 4 +- > hw/{ => pci}/msi.h | 2 +- > hw/{ => pci}/msix.c | 10 +- > hw/{ => pci}/msix.h | 2 +- > hw/{ => pci}/pci-hotplug.c | 22 +- > hw/{ => pci}/pci-stub.c | 6 +- > hw/{ => pci}/pci.c | 24 +- > hw/{ => pci}/pci.h | 14 +- > hw/{ => pci}/pci_bridge.c | 6 +- > hw/{ => pci}/pci_bridge.h | 2 +- > hw/{pci_internals.h => pci/pci_bus.h} | 16 +- > hw/{ => pci}/pci_host.c | 4 +- > hw/{ => pci}/pci_host.h | 2 +- > hw/{ => pci}/pci_ids.h | 4 + > hw/{ => pci}/pci_regs.h | 0 > hw/{ => pci}/pcie.c | 14 +- > hw/{ => pci}/pcie.h | 8 +- > hw/{ => pci}/pcie_aer.c | 18 +- > hw/{ => pci}/pcie_aer.h | 2 +- > hw/{ => pci}/pcie_host.c | 8 +- > hw/{ => pci}/pcie_host.h | 4 +- > hw/{ => pci}/pcie_port.c | 2 +- > hw/{ => pci}/pcie_port.h | 4 +- > hw/{ => pci}/pcie_regs.h | 0 > hw/{ => pci}/shpc.c | 12 +- > hw/{ => pci}/shpc.h | 4 +- > hw/{ => pci}/slotid_cap.c | 4 +- > hw/{ => pci}/slotid_cap.h | 0 > hw/pci_bridge_dev.c | 14 +- > hw/pckbd.c | 2 +- > hw/pcmcia.h | 5 + > hw/pcnet-pci.c | 8 +- > hw/pcnet.c | 8 +- > hw/pcnet.h | 7 +- > hw/pcspk.c | 2 +- > hw/petalogix_ml605_mmu.c | 8 +- > hw/petalogix_s3adsp1800_mmu.c | 8 +- > hw/pflash_cfi01.c | 8 +- > hw/pflash_cfi02.c | 8 +- > hw/piix4.c | 2 +- > hw/piix_pci.c | 6 +- > hw/pl011.c | 2 +- > hw/pl031.c | 4 +- > hw/pl110.c | 5 +- > hw/pl181.c | 2 +- > hw/ppc.c | 8 +- > hw/ppc.h | 5 + > hw/ppc/Makefile.objs | 2 +- > hw/ppc/e500.c | 12 +- > hw/ppc/e500plat.c | 2 +- > hw/ppc/mpc8544ds.c | 2 +- > hw/ppc405_boards.c | 10 +- > hw/ppc405_uc.c | 8 +- > hw/ppc440_bamboo.c | 12 +- > hw/ppc4xx.h | 2 +- > hw/ppc4xx_devs.c | 4 +- > hw/ppc4xx_pci.c | 6 +- > hw/ppc_booke.c | 6 +- > hw/ppc_mac.h | 2 +- > hw/ppc_newworld.c | 12 +- > hw/ppc_oldworld.c | 12 +- > hw/ppc_prep.c | 16 +- > hw/ppce500_pci.c | 8 +- > hw/ppce500_spin.c | 4 +- > hw/prep_pci.c | 6 +- > hw/ps2.c | 4 +- > hw/ptimer.c | 4 +- > hw/ptimer.h | 4 +- > hw/puv3.c | 6 +- > hw/pxa.h | 2 +- > hw/pxa2xx.c | 6 +- > hw/pxa2xx_keypad.c | 2 +- > hw/pxa2xx_lcd.c | 6 +- > hw/pxa2xx_timer.c | 4 +- > hw/q35.h | 6 +- > hw/qdev-addr.c | 4 +- > hw/qdev-addr.h | 5 + > hw/qdev-core.h | 10 +- > hw/qdev-monitor.c | 5 +- > hw/qdev-monitor.h | 2 +- > hw/qdev-properties.c | 9 +- > hw/qdev.c | 8 +- > hw/qxl-logger.c | 2 +- > hw/qxl.c | 8 +- > hw/qxl.h | 11 +- > hw/r2d.c | 10 +- > hw/rc4030.c | 2 +- > hw/realview.c | 10 +- > hw/rtl8139.c | 12 +- > hw/s390-virtio-bus.c | 9 +- > hw/s390-virtio-bus.h | 4 + > hw/s390-virtio.c | 14 +- > hw/s390x/event-facility.c | 4 +- > hw/s390x/event-facility.h | 2 +- > hw/s390x/sclp.c | 4 +- > hw/s390x/sclpconsole.c | 3 +- > hw/s390x/sclpquiesce.c | 2 +- > hw/sb16.c | 4 +- > hw/scsi-bus.c | 6 +- > hw/scsi-defs.h | 4 + > hw/scsi-disk.c | 8 +- > hw/scsi-generic.c | 4 +- > hw/scsi.h | 4 +- > hw/sd.c | 4 +- > hw/serial-pci.c | 2 +- > hw/serial.c | 6 +- > hw/serial.h | 8 +- > hw/sga.c | 4 +- > hw/sh7750.c | 4 +- > hw/sh_intc.h | 2 +- > hw/sh_pci.c | 8 +- > hw/sh_serial.c | 4 +- > hw/sh_timer.c | 4 +- > hw/shix.c | 4 +- > hw/slavio_intctl.c | 2 +- > hw/slavio_misc.c | 2 +- > hw/slavio_timer.c | 2 +- > hw/sm501.c | 7 +- > hw/smbios.c | 2 +- > hw/smbus_ich9.c | 18 +- > hw/smc91c111.c | 2 +- > hw/soc_dma.c | 2 +- > hw/soc_dma.h | 8 +- > hw/spapr.c | 18 +- > hw/spapr.h | 2 +- > hw/spapr_events.c | 6 +- > hw/spapr_hcall.c | 6 +- > hw/spapr_iommu.c | 6 +- > hw/spapr_llan.c | 2 +- > hw/spapr_nvram.c | 2 +- > hw/spapr_pci.c | 12 +- > hw/spapr_pci.h | 4 +- > hw/spapr_rtas.c | 6 +- > hw/spapr_vio.c | 8 +- > hw/spapr_vio.h | 2 +- > hw/spapr_vscsi.c | 1 - > hw/spapr_vty.c | 2 +- > hw/spitz.c | 12 +- > hw/ssd0303.c | 2 +- > hw/ssd0323.c | 2 +- > hw/ssi-sd.c | 2 +- > hw/stellaris.c | 6 +- > hw/stellaris_enet.c | 2 +- > hw/stellaris_input.c | 2 +- > hw/stream.h | 2 +- > hw/strongarm.c | 5 +- > hw/strongarm.h | 2 +- > hw/sun4c_intctl.c | 2 +- > hw/sun4m.c | 8 +- > hw/sun4u.c | 12 +- > hw/sysbus.c | 4 +- > hw/sysbus.h | 2 +- > hw/tc6393xb.c | 6 +- > hw/tcx.c | 5 +- > hw/tosa.c | 6 +- > hw/tsc2005.c | 4 +- > hw/tsc210x.c | 4 +- > hw/tusb6010.c | 2 +- > hw/twl92230.c | 6 +- > uboot_image.h => hw/uboot_image.h | 0 > hw/unin_pci.c | 4 +- > hw/usb.h | 2 +- > hw/usb/bus.c | 4 +- > hw/usb/combined-packet.c | 2 +- > hw/usb/core.c | 2 +- > hw/usb/dev-bluetooth.c | 2 +- > hw/usb/dev-hid.c | 4 +- > hw/usb/dev-network.c | 9 +- > hw/usb/dev-serial.c | 4 +- > hw/usb/dev-smartcard-reader.c | 4 +- > hw/usb/dev-storage.c | 12 +- > hw/usb/dev-uas.c | 4 +- > hw/usb/dev-wacom.c | 2 +- > hw/usb/hcd-ehci-pci.c | 4 +- > hw/usb/hcd-ehci.h | 12 +- > hw/usb/hcd-musb.c | 2 +- > hw/usb/hcd-ohci.c | 4 +- > hw/usb/hcd-uhci.c | 8 +- > hw/usb/hcd-xhci.c | 8 +- > hw/usb/host-bsd.c | 2 +- > hw/usb/host-linux.c | 6 +- > hw/usb/host-stub.c | 4 +- > hw/usb/libhw.c | 4 +- > hw/usb/redirect.c | 8 +- > hw/versatile_pci.c | 6 +- > hw/versatilepb.c | 10 +- > hw/vexpress.c | 8 +- > hw/vfio_pci.c | 20 +- > hw/vga-isa-mm.c | 6 +- > hw/vga-isa.c | 6 +- > hw/vga-pci.c | 8 +- > hw/vga.c | 8 +- > hw/vga_int.h | 8 +- > hw/vhost.c | 4 +- > hw/vhost.h | 2 +- > hw/vhost_net.c | 4 +- > hw/vhost_net.h | 2 +- > hw/virtex_ml507.c | 11 +- > hw/virtio-balloon.c | 8 +- > hw/virtio-balloon.h | 2 +- > hw/virtio-blk.c | 4 +- > hw/virtio-console.c | 4 +- > hw/virtio-net.c | 8 +- > hw/virtio-net.h | 30 +- > hw/virtio-pci.c | 15 +- > hw/virtio-rng.c | 2 +- > hw/virtio-scsi.h | 3 +- > hw/virtio-serial-bus.c | 6 +- > hw/virtio.c | 4 +- > hw/virtio.h | 6 +- > hw/vmmouse.c | 2 +- > hw/vmport.c | 2 +- > hw/vmware_vga.c | 4 +- > hw/vt82c686.c | 10 +- > hw/watchdog.c | 12 +- > hw/watchdog.h | 2 +- > hw/wdt_i6300esb.c | 4 +- > hw/wdt_ib700.c | 2 +- > hw/xen-host-pci-device.h | 2 +- > hw/xen_apic.c | 2 +- > hw/xen_backend.c | 4 +- > hw/xen_backend.h | 5 +- > hw/xen_common.h | 2 +- > hw/xen_console.c | 2 +- > hw/xen_devconfig.c | 2 +- > hw/xen_disk.c | 3 +- > hw/xen_domainbuild.c | 4 +- > hw/xen_machine_pv.c | 2 +- > hw/xen_nic.c | 3 +- > hw/xen_platform.c | 5 +- > hw/xen_pt.c | 6 +- > hw/xen_pt.h | 2 +- > hw/xen_pt_config_init.c | 2 +- > hw/xenfb.c | 4 +- > hw/xgmac.c | 6 +- > hw/xilinx.h | 8 +- > hw/xilinx_axidma.c | 5 +- > hw/xilinx_axienet.c | 5 +- > hw/xilinx_ethlite.c | 2 +- > hw/xilinx_spi.c | 4 +- > hw/xilinx_spips.c | 6 +- > hw/xilinx_timer.c | 2 +- > hw/xilinx_uartlite.c | 2 +- > hw/xilinx_zynq.c | 8 +- > hw/xio3130_downstream.c | 6 +- > hw/xio3130_downstream.h | 2 +- > hw/xio3130_upstream.c | 6 +- > hw/xio3130_upstream.h | 2 +- > hw/xtensa_lx60.c | 11 +- > hw/xtensa_pic.c | 4 +- > hw/xtensa_sim.c | 6 +- > hw/z2.c | 8 +- > hw/zynq_slcr.c | 4 +- > aes.h => include/block/aes.h | 0 > qemu-aio.h => include/block/aio.h | 4 +- > block.h => include/block/block.h | 8 +- > block_int.h => include/block/block_int.h | 14 +- > blockjob.h => include/block/blockjob.h | 2 +- > qemu-coroutine.h => include/block/coroutine.h | 4 +- > .../block/coroutine_int.h | 4 +- > nbd.h => include/block/nbd.h | 0 > thread-pool.h => include/block/thread-pool.h | 8 +- > include/bt/bt.h | 20 + > qemu-char.h => include/char/char.h | 14 +- > config.h => include/config.h | 0 > dis-asm.h => include/disas/bfd.h | 0 > disas.h => include/disas/disas.h | 0 > elf.h => include/elf.h | 0 > exec-memory.h => include/exec/address-spaces.h | 2 +- > cpu-all.h => include/exec/cpu-all.h | 6 +- > cpu-common.h => include/exec/cpu-common.h | 8 +- > cpu-defs.h => include/exec/cpu-defs.h | 6 +- > cputlb.h => include/exec/cputlb.h | 0 > def-helper.h => include/exec/def-helper.h | 0 > exec-all.h => include/exec/exec-all.h | 14 +- > gdbstub.h => include/exec/gdbstub.h | 0 > gen-icount.h => include/exec/gen-icount.h | 7 +- > hwaddr.h => include/exec/hwaddr.h | 0 > ioport.h => include/exec/ioport.h | 2 +- > iorange.h => include/exec/iorange.h | 0 > .../exec/memory-internal.h | 0 > memory.h => include/exec/memory.h | 12 +- > poison.h => include/exec/poison.h | 0 > softmmu-semi.h => include/exec/softmmu-semi.h | 4 + > softmmu_defs.h => include/exec/softmmu_defs.h | 0 > softmmu_exec.h => include/exec/softmmu_exec.h | 58 +-- > softmmu_header.h => include/exec/softmmu_header.h | 0 > .../exec/softmmu_template.h | 4 +- > qemu-lock.h => include/exec/spinlock.h | 0 > qemu-user-types.h => include/exec/user/abitypes.h | 0 > thunk.h => include/exec/user/thunk.h | 0 > {fpu => include/fpu}/softfloat.h | 2 +- > libfdt_env.h => include/libfdt_env.h | 2 +- > block-migration.h => include/migration/block.h | 0 > migration.h => include/migration/migration.h | 8 +- > include/{qemu => migration}/page_cache.h | 0 > qemu-file.h => include/migration/qemu-file.h | 0 > vmstate.h => include/migration/vmstate.h | 0 > monitor.h => include/monitor/monitor.h | 9 +- > readline.h => include/monitor/readline.h | 0 > {net => include/net}/checksum.h | 0 > net.h => include/net/net.h | 25 +- > {net => include/net}/queue.h | 0 > {net => include/net}/slirp.h | 4 +- > include/net/tap.h | 67 ++++ > .../qapi/dealloc-visitor.h | 2 +- > error.h => include/qapi/error.h | 2 +- > {qapi => include/qapi}/opts-visitor.h | 4 +- > {qapi => include/qapi}/qmp-input-visitor.h | 4 +- > {qapi => include/qapi}/qmp-output-visitor.h | 4 +- > qapi/qmp-core.h => include/qapi/qmp/dispatch.h | 6 +- > json-lexer.h => include/qapi/qmp/json-lexer.h | 4 +- > json-parser.h => include/qapi/qmp/json-parser.h | 4 +- > .../qapi/qmp/json-streamer.h | 4 +- > qbool.h => include/qapi/qmp/qbool.h | 2 +- > qdict.h => include/qapi/qmp/qdict.h | 6 +- > qerror.h => include/qapi/qmp/qerror.h | 8 +- > qfloat.h => include/qapi/qmp/qfloat.h | 2 +- > qint.h => include/qapi/qmp/qint.h | 2 +- > qjson.h => include/qapi/qmp/qjson.h | 6 +- > qlist.h => include/qapi/qmp/qlist.h | 6 +- > qobject.h => include/qapi/qmp/qobject.h | 0 > qstring.h => include/qapi/qmp/qstring.h | 2 +- > qemu-objects.h => include/qapi/qmp/types.h | 16 +- > {qapi => include/qapi}/string-input-visitor.h | 2 +- > {qapi => include/qapi}/string-output-visitor.h | 2 +- > include/qapi/visitor-impl.h | 63 +++ > qapi/qapi-visit-core.h => include/qapi/visitor.h | 42 +- > qemu-common.h => include/qemu-common.h | 14 +- > acl.h => include/qemu/acl.h | 2 +- > qemu-barrier.h => include/qemu/atomic.h | 2 +- > bitmap.h => include/qemu/bitmap.h | 2 +- > bitops.h => include/qemu/bitops.h | 0 > bswap.h => include/qemu/bswap.h | 2 +- > cache-utils.h => include/qemu/cache-utils.h | 0 > compatfd.h => include/qemu/compatfd.h | 0 > compiler.h => include/qemu/compiler.h | 0 > qemu-config.h => include/qemu/config-file.h | 5 +- > envlist.h => include/qemu/envlist.h | 0 > qemu-error.h => include/qemu/error-report.h | 0 > event_notifier.h => include/qemu/event_notifier.h | 0 > host-utils.h => include/qemu/host-utils.h | 6 +- > int128.h => include/qemu/int128.h | 0 > iov.h => include/qemu/iov.h | 5 + > qemu-log.h => include/qemu/log.h | 2 +- > main-loop.h => include/qemu/main-loop.h | 2 +- > module.h => include/qemu/module.h | 0 > notify.h => include/qemu/notify.h | 2 +- > qemu-option.h => include/qemu/option.h | 6 +- > .../qemu/option_int.h | 3 +- > osdep.h => include/qemu/osdep.h | 0 > qemu-queue.h => include/qemu/queue.h | 2 +- > range.h => include/qemu/range.h | 0 > include/qemu/rng-random.h | 2 +- > include/qemu/rng.h | 4 +- > qemu_socket.h => include/qemu/sockets.h | 6 +- > qemu-thread-posix.h => include/qemu/thread-posix.h | 0 > qemu-thread-win32.h => include/qemu/thread-win32.h | 0 > qemu-thread.h => include/qemu/thread.h | 4 +- > qemu-timer.h => include/qemu/timer.h | 4 +- > qemu-tls.h => include/qemu/tls.h | 0 > qemu-types.h => include/qemu/typedefs.h | 0 > uri.h => include/qemu/uri.h | 0 > qemu-xattr.h => include/qemu/xattr.h | 0 > include/{qemu => qom}/cpu.h | 4 +- > include/{qemu => qom}/object.h | 2 +- > include/{qemu => qom}/qom-qobject.h | 2 +- > arch_init.h => include/sysemu/arch_init.h | 0 > balloon.h => include/sysemu/balloon.h | 2 +- > blockdev.h => include/sysemu/blockdev.h | 6 +- > cpus.h => include/sysemu/cpus.h | 0 > device_tree.h => include/sysemu/device_tree.h | 0 > dma.h => include/sysemu/dma.h | 6 +- > dump.h => include/sysemu/dump.h | 0 > kvm.h => include/sysemu/kvm.h | 2 +- > .../sysemu/memory_mapping.h | 2 +- > qemu-os-posix.h => include/sysemu/os-posix.h | 0 > qemu-os-win32.h => include/sysemu/os-win32.h | 0 > qtest.h => include/sysemu/qtest.h | 0 > qemu-seccomp.h => include/sysemu/seccomp.h | 2 +- > sysemu.h => include/sysemu/sysemu.h | 12 +- > xen-mapcache.h => include/sysemu/xen-mapcache.h | 0 > console.h => include/ui/console.h | 11 +- > {hw => include/ui}/pixel_ops.h | 0 > qemu-pixman.h => include/ui/qemu-pixman.h | 0 > {ui => include/ui}/qemu-spice.h | 9 +- > {ui => include/ui}/spice-display.h | 6 +- > iohandler.c | 7 +- > ioport.c | 4 +- > iov.c | 2 +- > json-lexer.c | 10 +- > json-parser.c | 18 +- > json-streamer.c | 10 +- > kvm-all.c | 24 +- > kvm-stub.c | 6 +- > alpha.ld => ldscripts/alpha.ld | 0 > arm.ld => ldscripts/arm.ld | 0 > hppa.ld => ldscripts/hppa.ld | 0 > i386.ld => ldscripts/i386.ld | 0 > ia64.ld => ldscripts/ia64.ld | 0 > m68k.ld => ldscripts/m68k.ld | 0 > mips.ld => ldscripts/mips.ld | 0 > ppc.ld => ldscripts/ppc.ld | 0 > ppc64.ld => ldscripts/ppc64.ld | 0 > s390.ld => ldscripts/s390.ld | 0 > sparc.ld => ldscripts/sparc.ld | 0 > sparc64.ld => ldscripts/sparc64.ld | 0 > x86_64.ld => ldscripts/x86_64.ld | 0 > libcacard/event.c | 2 +- > libcacard/vreader.c | 2 +- > libcacard/vscclient.c | 4 +- > linux-user/arm/nwfpe/double_cpdo.c | 2 +- > linux-user/arm/nwfpe/extended_cpdo.c | 2 +- > linux-user/arm/nwfpe/fpa11.h | 2 +- > linux-user/arm/nwfpe/fpa11_cpdt.c | 2 +- > linux-user/arm/nwfpe/fpa11_cprt.c | 2 +- > linux-user/arm/nwfpe/fpopcode.c | 2 +- > linux-user/arm/nwfpe/single_cpdo.c | 2 +- > linux-user/cris/syscall.h | 5 + > linux-user/elfload.c | 2 +- > linux-user/main.c | 6 +- > linux-user/microblaze/syscall.h | 6 + > linux-user/qemu.h | 10 +- > linux-user/syscall.c | 2 +- > linux-user/syscall_defs.h | 6 + > main-loop.c | 8 +- > memory.c | 12 +- > memory_mapping-stub.c | 4 +- > memory_mapping.c | 4 +- > migration-exec.c | 7 +- > migration-fd.c | 11 +- > migration-tcp.c | 7 +- > migration-unix.c | 7 +- > migration.c | 12 +- > module.c | 4 +- > monitor.c | 52 +-- > nbd.c | 10 +- > net/Makefile.objs | 2 +- > net/clients.h | 2 +- > net/dump.c | 6 +- > net/hub.c | 6 +- > net/hub.h | 2 - > net.c => net/net.c | 17 +- > net/queue.c | 4 +- > net/slirp.c | 7 +- > net/socket.c | 13 +- > net/tap-aix.c | 2 +- > net/tap-bsd.c | 6 +- > net/tap-haiku.c | 2 +- > net/tap-linux.c | 15 +- > net/tap-linux.h | 20 +- > net/tap-solaris.c | 6 +- > net/tap-win32.c | 8 +- > net/tap.c | 13 +- > net/{tap.h => tap_int.h} | 18 +- > net/util.c | 2 +- > net/vde.c | 5 +- > notify.c | 2 +- > os-posix.c | 2 +- > os-win32.c | 2 +- > osdep.c | 4 +- > oslib-posix.c | 4 +- > oslib-win32.c | 6 +- > page_cache.c | 2 +- > pixman | 2 +- > qapi/opts-visitor.c | 10 +- > qapi/qapi-dealloc-visitor.c | 7 +- > qapi/qapi-types-core.h | 21 - > qapi/qapi-visit-core.c | 6 +- > qapi/qapi-visit-impl.h | 23 -- > qapi/qmp-dispatch.c | 10 +- > qapi/qmp-input-visitor.c | 10 +- > qapi/qmp-output-visitor.c | 10 +- > qapi/qmp-registry.c | 2 +- > qapi/string-input-visitor.c | 6 +- > qapi/string-output-visitor.c | 6 +- > qbool.c | 4 +- > qdict.c | 14 +- > qemu-bridge-helper.c | 2 +- > qemu-char.c | 13 +- > qemu-config.c | 8 +- > qemu-coroutine-io.c | 6 +- > qemu-coroutine-lock.c | 8 +- > qemu-coroutine-sleep.c | 4 +- > qemu-coroutine.c | 4 +- > qemu-error.c | 2 +- > qemu-img.c | 12 +- > qemu-io.c | 4 +- > qemu-log.c | 2 +- > qemu-nbd.c | 4 +- > qemu-option.c | 10 +- > qemu-progress.c | 4 +- > qemu-seccomp.c | 2 +- > qemu-sockets.c | 6 +- > qemu-thread-posix.c | 2 +- > qemu-thread-win32.c | 2 +- > qemu-timer-common.c | 2 +- > qemu-timer.c | 11 +- > qemu-tool.c | 14 +- > qemu-user.c | 2 +- > qerror.c | 6 +- > qfloat.c | 4 +- > qga/Makefile.objs | 2 +- > qga/channel-posix.c | 4 +- > qga/commands-posix.c | 6 +- > qga/commands-win32.c | 2 +- > qga/commands.c | 2 +- > qga/guest-agent-core.h | 2 +- > qemu-ga.c => qga/main.c | 14 +- > qapi-schema-guest.json => qga/qapi-schema.json | 0 > qint.c | 4 +- > qjson.c | 18 +- > qlist.c | 6 +- > qmp.c | 11 +- > qom/container.c | 4 +- > qom/cpu.c | 2 +- > qom/object.c | 15 +- > qom/qom-qobject.c | 6 +- > qstring.c | 4 +- > qtest.c | 12 +- > readline.c | 4 +- > rules.mak | 5 +- > savevm.c | 23 +- > scripts/feature_to_c.sh | 2 +- > scripts/get_maintainer.pl | 25 +- > scripts/qapi-commands.py | 15 +- > scripts/qapi-types.py | 2 +- > scripts/qapi-visit.py | 3 +- > slirp/bootp.h | 4 + > slirp/if.c | 2 +- > slirp/ip_input.c | 2 +- > slirp/main.h | 4 + > slirp/misc.c | 4 +- > slirp/sbuf.c | 2 +- > slirp/slirp.c | 4 +- > slirp/slirp.h | 4 +- > slirp/tftp.h | 4 + > spice-qemu-char.c | 3 +- > stubs/arch-query-cpu-def.c | 4 +- > stubs/fd-register.c | 2 +- > stubs/fdset-add-fd.c | 2 +- > stubs/fdset-find-fd.c | 2 +- > stubs/fdset-get-fd.c | 2 +- > stubs/fdset-remove-fd.c | 2 +- > stubs/get-fd.c | 2 +- > stubs/set-fd-handler.c | 2 +- > target-alpha/cpu-qom.h | 2 +- > target-alpha/cpu.h | 8 +- > target-alpha/fpu_helper.c | 2 +- > target-alpha/helper.c | 2 +- > target-alpha/helper.h | 4 +- > target-alpha/int_helper.c | 2 +- > target-alpha/mem_helper.c | 10 +- > target-alpha/sys_helper.c | 4 +- > target-alpha/translate.c | 8 +- > target-arm/arm-semi.c | 4 +- > target-arm/cpu-qom.h | 2 +- > target-arm/cpu.c | 2 +- > target-arm/cpu.h | 8 +- > target-arm/helper.c | 8 +- > target-arm/helper.h | 4 +- > target-arm/iwmmxt_helper.c | 2 +- > target-arm/neon_helper.c | 2 +- > target-arm/op_helper.c | 10 +- > target-arm/translate.c | 6 +- > target-cris/cpu-qom.h | 2 +- > target-cris/cpu.h | 6 +- > target-cris/crisv32-decode.h | 4 + > target-cris/helper.c | 2 +- > target-cris/helper.h | 4 +- > target-cris/op_helper.c | 12 +- > target-cris/translate.c | 4 +- > target-i386/arch_dump.c | 4 +- > target-i386/arch_memory_mapping.c | 4 +- > target-i386/cpu-qom.h | 4 +- > target-i386/cpu.c | 13 +- > target-i386/cpu.h | 8 +- > target-i386/excp_helper.c | 4 +- > target-i386/fpu_helper.c | 2 +- > target-i386/helper.c | 6 +- > target-i386/helper.h | 4 +- > target-i386/int_helper.c | 2 +- > target-i386/ioport-user.c | 2 +- > target-i386/kvm.c | 13 +- > target-i386/kvm_i386.h | 2 +- > target-i386/machine.c | 2 +- > target-i386/mem_helper.c | 10 +- > target-i386/misc_helper.c | 4 +- > target-i386/seg_helper.c | 4 +- > target-i386/svm_helper.c | 4 +- > target-i386/translate.c | 4 +- > target-lm32/cpu-qom.h | 2 +- > target-lm32/cpu.h | 6 +- > target-lm32/helper.c | 2 +- > target-lm32/helper.h | 4 +- > target-lm32/op_helper.c | 10 +- > target-lm32/translate.c | 4 +- > target-m68k/cpu-qom.h | 2 +- > target-m68k/cpu.h | 8 +- > target-m68k/helper.c | 2 +- > target-m68k/helpers.h | 4 +- > target-m68k/m68k-semi.c | 6 +- > target-m68k/op_helper.c | 10 +- > target-m68k/translate.c | 6 +- > target-microblaze/cpu-qom.h | 2 +- > target-microblaze/cpu.h | 8 +- > target-microblaze/helper.c | 4 +- > target-microblaze/helper.h | 4 +- > target-microblaze/op_helper.c | 12 +- > target-microblaze/translate.c | 4 +- > target-mips/cpu-qom.h | 2 +- > target-mips/cpu.h | 8 +- > target-mips/helper.h | 4 +- > target-mips/op_helper.c | 12 +- > target-mips/translate.c | 4 +- > target-openrisc/cpu.h | 12 +- > target-openrisc/helper.h | 4 +- > target-openrisc/int_helper.c | 2 +- > target-openrisc/interrupt.c | 4 +- > target-openrisc/mmu.c | 4 +- > target-openrisc/mmu_helper.c | 10 +- > target-openrisc/translate.c | 10 +- > target-ppc/cpu-qom.h | 2 +- > target-ppc/cpu.h | 8 +- > target-ppc/helper.c | 4 +- > target-ppc/helper.h | 4 +- > target-ppc/int_helper.c | 2 +- > target-ppc/kvm.c | 10 +- > target-ppc/kvm_ppc.c | 4 +- > target-ppc/kvm_ppc.h | 2 +- > target-ppc/machine.c | 2 +- > target-ppc/mem_helper.c | 12 +- > target-ppc/mmu_helper.c | 2 +- > target-ppc/translate.c | 6 +- > target-ppc/translate_init.c | 8 +- > target-s390x/cpu-qom.h | 2 +- > target-s390x/cpu.c | 2 +- > target-s390x/cpu.h | 8 +- > target-s390x/fpu_helper.c | 2 +- > target-s390x/helper.c | 6 +- > target-s390x/helper.h | 4 +- > target-s390x/int_helper.c | 2 +- > target-s390x/interrupt.c | 2 +- > target-s390x/kvm.c | 8 +- > target-s390x/mem_helper.c | 10 +- > target-s390x/misc_helper.c | 12 +- > target-s390x/translate.c | 6 +- > target-sh4/cpu-qom.h | 2 +- > target-sh4/cpu.h | 10 +- > target-sh4/helper.h | 4 +- > target-sh4/op_helper.c | 10 +- > target-sh4/translate.c | 4 +- > target-sparc/cpu-qom.h | 2 +- > target-sparc/cpu.h | 10 +- > target-sparc/helper.c | 4 +- > target-sparc/helper.h | 4 +- > target-sparc/int32_helper.c | 2 +- > target-sparc/ldst_helper.c | 10 +- > target-sparc/machine.c | 2 +- > target-sparc/mmu_helper.c | 2 +- > target-sparc/translate.c | 4 +- > target-unicore32/cpu-qom.h | 2 +- > target-unicore32/cpu.h | 8 +- > target-unicore32/helper.c | 6 +- > target-unicore32/helper.h | 4 +- > target-unicore32/op_helper.c | 8 +- > target-unicore32/translate.c | 6 +- > target-xtensa/core-dc232b.c | 6 +- > target-xtensa/core-dc233c.c | 6 +- > target-xtensa/core-fsf.c | 6 +- > target-xtensa/cpu-qom.h | 2 +- > target-xtensa/cpu.h | 6 +- > target-xtensa/helper.c | 6 +- > target-xtensa/helper.h | 4 +- > target-xtensa/op_helper.c | 10 +- > target-xtensa/translate.c | 10 +- > target-xtensa/xtensa-semi.c | 2 +- > tcg/arm/tcg-target.c | 2 +- > tcg/arm/tcg-target.h | 3 + > tcg/hppa/tcg-target.c | 2 +- > tcg/hppa/tcg-target.h | 3 + > tcg/i386/tcg-target.c | 2 +- > tcg/i386/tcg-target.h | 3 + > tcg/ia64/tcg-target.c | 2 +- > tcg/ia64/tcg-target.h | 3 + > tcg/mips/tcg-target.c | 2 +- > tcg/mips/tcg-target.h | 3 + > tcg/ppc/tcg-target.c | 2 +- > tcg/ppc/tcg-target.h | 3 + > tcg/ppc64/tcg-target.c | 2 +- > tcg/ppc64/tcg-target.h | 3 + > tcg/s390/tcg-target.c | 2 +- > tcg/s390/tcg-target.h | 3 + > tcg/sparc/tcg-target.c | 2 +- > tcg/sparc/tcg-target.h | 3 + > tcg/tcg.c | 6 +- > tci.c | 2 +- > tests/check-qdict.c | 6 +- > tests/check-qfloat.c | 2 +- > tests/check-qint.c | 2 +- > tests/check-qjson.c | 14 +- > tests/check-qlist.c | 4 +- > tests/check-qstring.c | 2 +- > tests/libqtest.c | 4 +- > tests/tcg/cris/crisutils.h | 5 + > tests/tcg/test-i386-fprem.c | 4 +- > tests/tcg/test-i386.c | 2 +- > tests/test-aio.c | 2 +- > tests/test-coroutine.c | 2 +- > tests/test-iov.c | 4 +- > tests/test-qmp-commands.c | 6 +- > tests/test-qmp-input-strict.c | 2 +- > tests/test-qmp-input-visitor.c | 2 +- > tests/test-qmp-output-visitor.c | 2 +- > tests/test-string-input-visitor.c | 2 +- > tests/test-string-output-visitor.c | 2 +- > tests/test-thread-pool.c | 6 +- > tests/test-visitor-serialization.c | 2 +- > thread-pool.c | 14 +- > thunk.c | 2 +- > trace/simple.c | 2 +- > translate-all.c | 10 +- > ui/Makefile.objs | 7 +- > ui/cocoa.m | 4 +- > console.c => ui/console.c | 5 +- > ui/curses.c | 4 +- > ui/curses_keys.h | 5 + > cursor.c => ui/cursor.c | 2 +- > cursor_hidden.xpm => ui/cursor_hidden.xpm | 0 > cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm | 0 > ui/d3des.h | 4 + > input.c => ui/input.c | 9 +- > ui/keymaps.c | 2 +- > qemu-pixman.c => ui/qemu-pixman.c | 2 +- > qemu-x509.h => ui/qemu-x509.h | 0 > ui/sdl.c | 4 +- > ui/sdl_zoom.c | 2 +- > ui/spice-core.c | 28 +- > ui/spice-display.c | 14 +- > ui/spice-input.c | 4 +- > vgafont.h => ui/vgafont.h | 0 > ui/vnc-auth-sasl.h | 2 +- > ui/vnc-enc-tight.c | 4 +- > ui/vnc-jobs.c | 2 +- > ui/vnc-palette.h | 4 +- > ui/vnc-tls.c | 2 +- > ui/vnc-tls.h | 2 +- > ui/vnc.c | 12 +- > ui/vnc.h | 10 +- > uri.c | 2 +- > user-exec.c | 2 +- > vl.c | 54 +-- > xen-all.c | 8 +- > xen-mapcache.c | 6 +- > xen-stub.c | 2 +- > 1124 files changed, 3142 insertions(+), 3427 deletions(-) > delete mode 100644 Makefile.dis > delete mode 100644 Makefile.user > delete mode 100644 a.out.h > delete mode 100644 bt-host.h > create mode 100644 disas/Makefile.objs > rename alpha-dis.c => disas/alpha.c (99%) > rename arm-dis.c => disas/arm.c (99%) > rename cris-dis.c => disas/cris.c (99%) > rename hppa-dis.c => disas/hppa.c (99%) > rename i386-dis.c => disas/i386.c (99%) > rename ia64-dis.c => disas/ia64.c (99%) > rename lm32-dis.c => disas/lm32.c (99%) > rename m68k-dis.c => disas/m68k.c (99%) > rename microblaze-dis.c => disas/microblaze.c (99%) > rename mips-dis.c => disas/mips.c (99%) > rename ppc-dis.c => disas/ppc.c (99%) > rename s390-dis.c => disas/s390.c (99%) > rename sh4-dis.c => disas/sh4.c (99%) > rename sparc-dis.c => disas/sparc.c (99%) > rename tci-dis.c => disas/tci.c (98%) > create mode 100644 hw/pci/Makefile.objs > rename hw/{ => pci}/msi.c (99%) > rename hw/{ => pci}/msi.h (98%) > rename hw/{ => pci}/msix.c (99%) > rename hw/{ => pci}/msix.h (98%) > rename hw/{ => pci}/pci-hotplug.c (96%) > rename hw/{ => pci}/pci-stub.c (94%) > rename hw/{ => pci}/pci.c (99%) > rename hw/{ => pci}/pci.h (99%) > rename hw/{ => pci}/pci_bridge.c (99%) > rename hw/{ => pci}/pci_bridge.h (98%) > rename hw/{pci_internals.h => pci/pci_bus.h} (79%) > rename hw/{ => pci}/pci_host.c (99%) > rename hw/{ => pci}/pci_host.h (99%) > rename hw/{ => pci}/pci_ids.h (98%) > rename hw/{ => pci}/pci_regs.h (100%) > rename hw/{ => pci}/pcie.c (99%) > rename hw/{ => pci}/pcie.h (98%) > rename hw/{ => pci}/pcie_aer.c (99%) > rename hw/{ => pci}/pcie_aer.h (99%) > rename hw/{ => pci}/pcie_host.c (97%) > rename hw/{ => pci}/pcie_host.h (96%) > rename hw/{ => pci}/pcie_port.c (99%) > rename hw/{ => pci}/pcie_port.h (96%) > rename hw/{ => pci}/pcie_regs.h (100%) > rename hw/{ => pci}/shpc.c (99%) > rename hw/{ => pci}/shpc.h (95%) > rename hw/{ => pci}/slotid_cap.c (95%) > rename hw/{ => pci}/slotid_cap.h (100%) > rename uboot_image.h => hw/uboot_image.h (100%) > rename aes.h => include/block/aes.h (100%) > rename qemu-aio.h => include/block/aio.h (99%) > rename block.h => include/block/block.h (99%) > rename block_int.h => include/block/block_int.h (98%) > rename blockjob.h => include/block/blockjob.h (99%) > rename qemu-coroutine.h => include/block/coroutine.h (99%) > rename qemu-coroutine-int.h => include/block/coroutine_int.h (96%) > rename nbd.h => include/block/nbd.h (100%) > rename thread-pool.h => include/block/thread-pool.h (88%) > create mode 100644 include/bt/bt.h > rename qemu-char.h => include/char/char.h (97%) > rename config.h => include/config.h (100%) > rename dis-asm.h => include/disas/bfd.h (100%) > rename disas.h => include/disas/disas.h (100%) > rename elf.h => include/elf.h (100%) > rename exec-memory.h => include/exec/address-spaces.h (97%) > rename cpu-all.h => include/exec/cpu-all.h (99%) > rename cpu-common.h => include/exec/cpu-common.h (97%) > rename cpu-defs.h => include/exec/cpu-defs.h (99%) > rename cputlb.h => include/exec/cputlb.h (100%) > rename def-helper.h => include/exec/def-helper.h (100%) > rename exec-all.h => include/exec/exec-all.h (98%) > rename gdbstub.h => include/exec/gdbstub.h (100%) > rename gen-icount.h => include/exec/gen-icount.h (94%) > rename hwaddr.h => include/exec/hwaddr.h (100%) > rename ioport.h => include/exec/ioport.h (99%) > rename iorange.h => include/exec/iorange.h (100%) > rename memory-internal.h => include/exec/memory-internal.h (100%) > rename memory.h => include/exec/memory.h (99%) > rename poison.h => include/exec/poison.h (100%) > rename softmmu-semi.h => include/exec/softmmu-semi.h (97%) > rename softmmu_defs.h => include/exec/softmmu_defs.h (100%) > rename softmmu_exec.h => include/exec/softmmu_exec.h (72%) > rename softmmu_header.h => include/exec/softmmu_header.h (100%) > rename softmmu_template.h => include/exec/softmmu_template.h (99%) > rename qemu-lock.h => include/exec/spinlock.h (100%) > rename qemu-user-types.h => include/exec/user/abitypes.h (100%) > rename thunk.h => include/exec/user/thunk.h (100%) > rename {fpu => include/fpu}/softfloat.h (99%) > rename libfdt_env.h => include/libfdt_env.h (97%) > rename block-migration.h => include/migration/block.h (100%) > rename migration.h => include/migration/migration.h (97%) > rename include/{qemu => migration}/page_cache.h (100%) > rename qemu-file.h => include/migration/qemu-file.h (100%) > rename vmstate.h => include/migration/vmstate.h (100%) > rename monitor.h => include/monitor/monitor.h (96%) > rename readline.h => include/monitor/readline.h (100%) > rename {net => include/net}/checksum.h (100%) > rename net.h => include/net/net.h (90%) > rename {net => include/net}/queue.h (100%) > rename {net => include/net}/slirp.h (96%) > create mode 100644 include/net/tap.h > rename qapi/qapi-dealloc-visitor.h => include/qapi/dealloc-visitor.h (95%) > rename error.h => include/qapi/error.h (98%) > rename {qapi => include/qapi}/opts-visitor.h (93%) > rename {qapi => include/qapi}/qmp-input-visitor.h (91%) > rename {qapi => include/qapi}/qmp-output-visitor.h (91%) > rename qapi/qmp-core.h => include/qapi/qmp/dispatch.h (93%) > rename json-lexer.h => include/qapi/qmp/json-lexer.h (94%) > rename json-parser.h => include/qapi/qmp/json-parser.h (90%) > rename json-streamer.h => include/qapi/qmp/json-streamer.h (93%) > rename qbool.h => include/qapi/qmp/qbool.h (94%) > rename qdict.h => include/qapi/qmp/qdict.h (96%) > rename qerror.h => include/qapi/qmp/qerror.h (98%) > rename qfloat.h => include/qapi/qmp/qfloat.h (94%) > rename qint.h => include/qapi/qmp/qint.h (94%) > rename qjson.h => include/qapi/qmp/qjson.h (88%) > rename qlist.h => include/qapi/qmp/qlist.h (95%) > rename qobject.h => include/qapi/qmp/qobject.h (100%) > rename qstring.h => include/qapi/qmp/qstring.h (96%) > rename qemu-objects.h => include/qapi/qmp/types.h (60%) > rename {qapi => include/qapi}/string-input-visitor.h (95%) > rename {qapi => include/qapi}/string-output-visitor.h (95%) > create mode 100644 include/qapi/visitor-impl.h > rename qapi/qapi-visit-core.h => include/qapi/visitor.h (52%) > rename qemu-common.h => include/qemu-common.h (98%) > rename acl.h => include/qemu/acl.h (98%) > rename qemu-barrier.h => include/qemu/atomic.h (96%) > rename bitmap.h => include/qemu/bitmap.h (99%) > rename bitops.h => include/qemu/bitops.h (100%) > rename bswap.h => include/qemu/bswap.h (99%) > rename cache-utils.h => include/qemu/cache-utils.h (100%) > rename compatfd.h => include/qemu/compatfd.h (100%) > rename compiler.h => include/qemu/compiler.h (100%) > rename qemu-config.h => include/qemu/config-file.h (91%) > rename envlist.h => include/qemu/envlist.h (100%) > rename qemu-error.h => include/qemu/error-report.h (100%) > rename event_notifier.h => include/qemu/event_notifier.h (100%) > rename host-utils.h => include/qemu/host-utils.h (98%) > rename int128.h => include/qemu/int128.h (100%) > rename iov.h => include/qemu/iov.h (99%) > rename qemu-log.h => include/qemu/log.h (99%) > rename main-loop.h => include/qemu/main-loop.h (99%) > rename module.h => include/qemu/module.h (100%) > rename notify.h => include/qemu/notify.h (97%) > rename qemu-option.h => include/qemu/option.h (98%) > rename qemu-option-internal.h => include/qemu/option_int.h (96%) > rename osdep.h => include/qemu/osdep.h (100%) > rename qemu-queue.h => include/qemu/queue.h (99%) > rename range.h => include/qemu/range.h (100%) > rename qemu_socket.h => include/qemu/sockets.h (96%) > rename qemu-thread-posix.h => include/qemu/thread-posix.h (100%) > rename qemu-thread-win32.h => include/qemu/thread-win32.h (100%) > rename qemu-thread.h => include/qemu/thread.h (96%) > rename qemu-timer.h => include/qemu/timer.h (99%) > rename qemu-tls.h => include/qemu/tls.h (100%) > rename qemu-types.h => include/qemu/typedefs.h (100%) > rename uri.h => include/qemu/uri.h (100%) > rename qemu-xattr.h => include/qemu/xattr.h (100%) > rename include/{qemu => qom}/cpu.h (98%) > rename include/{qemu => qom}/object.h (99%) > rename include/{qemu => qom}/qom-qobject.h (97%) > rename arch_init.h => include/sysemu/arch_init.h (100%) > rename balloon.h => include/sysemu/balloon.h (95%) > rename blockdev.h => include/sysemu/blockdev.h (96%) > rename cpus.h => include/sysemu/cpus.h (100%) > rename device_tree.h => include/sysemu/device_tree.h (100%) > rename dma.h => include/sysemu/dma.h (99%) > rename dump.h => include/sysemu/dump.h (100%) > rename kvm.h => include/sysemu/kvm.h (99%) > rename memory_mapping.h => include/sysemu/memory_mapping.h (98%) > rename qemu-os-posix.h => include/sysemu/os-posix.h (100%) > rename qemu-os-win32.h => include/sysemu/os-win32.h (100%) > rename qtest.h => include/sysemu/qtest.h (100%) > rename qemu-seccomp.h => include/sysemu/seccomp.h (95%) > rename sysemu.h => include/sysemu/sysemu.h (97%) > rename xen-mapcache.h => include/sysemu/xen-mapcache.h (100%) > rename console.h => include/ui/console.h (99%) > rename {hw => include/ui}/pixel_ops.h (100%) > rename qemu-pixman.h => include/ui/qemu-pixman.h (100%) > rename {ui => include/ui}/qemu-spice.h (95%) > rename {ui => include/ui}/spice-display.h (98%) > rename alpha.ld => ldscripts/alpha.ld (100%) > rename arm.ld => ldscripts/arm.ld (100%) > rename hppa.ld => ldscripts/hppa.ld (100%) > rename i386.ld => ldscripts/i386.ld (100%) > rename ia64.ld => ldscripts/ia64.ld (100%) > rename m68k.ld => ldscripts/m68k.ld (100%) > rename mips.ld => ldscripts/mips.ld (100%) > rename ppc.ld => ldscripts/ppc.ld (100%) > rename ppc64.ld => ldscripts/ppc64.ld (100%) > rename s390.ld => ldscripts/s390.ld (100%) > rename sparc.ld => ldscripts/sparc.ld (100%) > rename sparc64.ld => ldscripts/sparc64.ld (100%) > rename x86_64.ld => ldscripts/x86_64.ld (100%) > rename net.c => net/net.c (99%) > rename net/{tap.h => tap_int.h} (77%) > delete mode 100644 qapi/qapi-types-core.h > delete mode 100644 qapi/qapi-visit-impl.h > rename qemu-ga.c => qga/main.c (99%) > rename qapi-schema-guest.json => qga/qapi-schema.json (100%) > rename console.c => ui/console.c (99%) > rename cursor.c => ui/cursor.c (99%) > rename cursor_hidden.xpm => ui/cursor_hidden.xpm (100%) > rename cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm (100%) > rename input.c => ui/input.c (99%) > rename qemu-pixman.c => ui/qemu-pixman.c (98%) > rename qemu-x509.h => ui/qemu-x509.h (100%) > rename vgafont.h => ui/vgafont.h (100%) > --- > 1.8.0.2
On 20 December 2012 00:54, Anthony Liguori <anthony@codemonkey.ws> wrote: > Paolo Bonzini <pbonzini@redhat.com> writes: > >> Anthony, >> >> The following changes since commit a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0: >> >> exec: refactor cpu_restore_state (2012-12-16 08:35:24 +0000) >> >> are available in the git repository at: >> >> git://github.com/bonzini/qemu.git header-dirs >> >> for you to fetch changes up to 394394a788cec72682750f855e5182de156026b4: >> >> janitor: move remaining public headers to include/ (2012-12-17 >> 18:56:58 +0100) > > Pulled. Thanks. This breaks building on my macos box, because qmp.o is no longer built with the necessary include flags to pick up the gnutls includes. Old build: cc -I/Users/pm215/src/qemu/slirp -I. -I/Users/pm215/src/qemu -I/Users/pm215/src/qemu/fpu -m64 -DOS_OBJECT_USE_OBJC=0 -arch x86_64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -Wno-initializer-overrides -fstack-protector-all -Wendif-labels -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-definition -Wtype-limits -I/sw/include/libpng15 -I/opt/X11/include/pixman-1 -I/sw/include/glib-2.0 -I/sw/lib/glib-2.0/include -I/sw/include -I/Users/pm215/src/qemu/include -MMD -MP -MT qmp.o -MF ./qmp.d -O2 -D_FORTIFY_SOURCE=2 -g -c -o qmp.o qmp.c New build: cc -I. -I/Users/pm215/src/qemu -I/Users/pm215/src/qemu/include -m64 -DOS_OBJECT_USE_OBJC=0 -arch x86_64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -Wno-initializer-overrides -fstack-protector-all -Wendif-labels -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-definition -Wtype-limits -I/sw/include/libpng15 -I/opt/X11/include/pixman-1 -I. -I. -I/sw/include/glib-2.0 -I/sw/lib/glib-2.0/include -MMD -MP -MT qmp.o -MF ./qmp.d -O2 -D_FORTIFY_SOURCE=2 -g -c -o qmp.o qmp.c In file included from qmp.c:21: In file included from ./ui/vnc.h:96: ./ui/vnc-tls.h:31:10: fatal error: 'gnutls/gnutls.h' file not found #include <gnutls/gnutls.h> ^ 1 error generated. (-I/sw/include is missing, this is VNC_TLS_CFLAGS). -- PMM
Anthony, The following changes since commit a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0: exec: refactor cpu_restore_state (2012-12-16 08:35:24 +0000) are available in the git repository at: git://github.com/bonzini/qemu.git header-dirs for you to fetch changes up to 394394a788cec72682750f855e5182de156026b4: janitor: move remaining public headers to include/ (2012-12-17 18:56:58 +0100) ---------------------------------------------------------------- Jason Baron (1): Fixup q35/ich9 Licenses Michael S. Tsirkin (12): tap: reset vnet header size on open get_maintainer.pl: update from linix 3.8 pci: prepare makefiles for pci code reorganization MAINTAINERS: add hw/pci/ to list of PCI files pci: move pci core code to hw/pci pci: update all users to look in pci/ pci: fix path for local includes Revert "pci: prepare makefiles for pci code reorganization" pci: rename pci_internals.h pci_bus.h pci_bus: update comment pci_bus.h: tweak include guards kvm: do not flush after deleting gsi Paolo Bonzini (33): Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD libcacard: simplify rules for recursive build vscclient: use per-target variables build: adjust setting of QEMU_INCLUDES build: add $(TARGET_DIR) to "GEN config-target.h" lines build: move rules from Makefile to */Makefile.objs build: create ldscripts/ build: kill libdis, move disassemblers to disas/ build: kill libuser janitor: do not rely on indirect inclusions of or from qemu-char.h janitor: do not include qemu-char everywhere net: move Bluetooth stuff out of net.h net: do not include net.h everywhere net: move net.c to net/ net: reorganize headers qemu-ga: move qemu-ga files to qga/ ui: move files to ui/ and include/ui/ qapi: move inclusions of qemu-common.h from headers to .c files qapi: remove qapi/qapi-types-core.h qapi: make struct Visitor opaque janitor: add guards to headers qapi: move include files to include/qobject/ block: move include files to include/block/ exec: move include files to include/exec/ monitor: move include files to include/monitor/ migration: move include files to include/migration/ qom: move include files to include/qom/ misc: move include files to include/qemu/ softmmu: move include files to include/sysemu/ softmmu: move remaining include files to include/ subdirectories fpu: move public header file to include/fpu hw: move executable format header files to hw/ janitor: move remaining public headers to include/ .gitignore | 1 + MAINTAINERS | 1 + Makefile | 47 +-- Makefile.dis | 20 - Makefile.objs | 32 +- Makefile.target | 8 +- Makefile.user | 24 -- a.out.h | 430 --------------------- acl.c | 2 +- aes.c | 2 +- aio-posix.c | 6 +- aio-win32.c | 6 +- arch_init.c | 24 +- async.c | 4 +- audio/Makefile.objs | 3 + audio/alsaaudio.c | 2 +- audio/audio.c | 6 +- audio/audio.h | 2 +- audio/noaudio.c | 2 +- audio/ossaudio.c | 4 +- audio/spiceaudio.c | 2 +- audio/wavaudio.c | 2 +- audio/wavcapture.c | 2 +- audio/winwaveaudio.c | 2 +- backends/rng-egd.c | 4 +- backends/rng-random.c | 4 +- backends/rng.c | 2 +- balloon.c | 10 +- bitmap.c | 4 +- bitops.c | 2 +- block-migration.c | 12 +- block.c | 18 +- block/Makefile.objs | 2 + block/blkdebug.c | 5 +- block/blkverify.c | 4 +- block/bochs.c | 4 +- block/cloop.c | 4 +- block/commit.c | 4 +- block/cow.c | 4 +- block/curl.c | 2 +- block/dmg.c | 6 +- block/gluster.c | 6 +- block/iscsi.c | 5 +- block/linux-aio.c | 6 +- block/mirror.c | 4 +- block/nbd.c | 10 +- block/parallels.c | 4 +- block/qcow.c | 8 +- block/qcow2-cache.c | 2 +- block/qcow2-cluster.c | 2 +- block/qcow2-refcount.c | 2 +- block/qcow2-snapshot.c | 2 +- block/qcow2.c | 10 +- block/qcow2.h | 4 +- block/qed-table.c | 2 +- block/qed.c | 6 +- block/qed.h | 2 +- block/raw-posix.c | 13 +- block/raw-win32.c | 10 +- block/raw.c | 4 +- block/rbd.c | 4 +- block/sheepdog.c | 8 +- block/stream.c | 4 +- block/vdi.c | 8 +- block/vmdk.c | 6 +- block/vpc.c | 6 +- block/vvfat.c | 6 +- block/win32-aio.c | 10 +- blockdev-nbd.c | 12 +- blockdev.c | 20 +- blockjob.c | 14 +- bsd-user/elfload.c | 2 +- bsd-user/main.c | 4 +- bsd-user/qemu.h | 6 +- bt-host.c | 5 +- bt-host.h | 9 - bt-vhci.c | 4 +- buffered_file.c | 3 +- buffered_file.h | 2 +- cache-utils.c | 2 +- cmd.c | 4 +- compatfd.c | 2 +- configure | 53 +-- coroutine-gthread.c | 2 +- coroutine-sigaltstack.c | 2 +- coroutine-ucontext.c | 2 +- coroutine-win32.c | 2 +- cpu-exec.c | 6 +- cpus.c | 22 +- cputlb.c | 18 +- cutils.c | 6 +- device_tree.c | 6 +- disas.c | 6 +- disas/Makefile.objs | 16 + alpha-dis.c => disas/alpha.c | 2 +- arm-dis.c => disas/arm.c | 2 +- cris-dis.c => disas/cris.c | 2 +- hppa-dis.c => disas/hppa.c | 2 +- i386-dis.c => disas/i386.c | 2 +- ia64-dis.c => disas/ia64.c | 2 +- lm32-dis.c => disas/lm32.c | 2 +- m68k-dis.c => disas/m68k.c | 2 +- microblaze-dis.c => disas/microblaze.c | 2 +- mips-dis.c => disas/mips.c | 2 +- ppc-dis.c => disas/ppc.c | 2 +- s390-dis.c => disas/s390.c | 2 +- sh4-dis.c => disas/sh4.c | 2 +- sparc-dis.c => disas/sparc.c | 2 +- tci-dis.c => disas/tci.c | 2 +- dma-helpers.c | 6 +- dump-stub.c | 4 +- dump.c | 18 +- envlist.c | 4 +- error.c | 8 +- event_notifier-posix.c | 5 +- event_notifier-win32.c | 4 +- exec.c | 19 +- fpu/softfloat.c | 2 +- fsdev/qemu-fsdev-dummy.c | 4 +- fsdev/qemu-fsdev.c | 6 +- fsdev/qemu-fsdev.h | 2 +- fsdev/virtfs-proxy-helper.c | 4 +- fsdev/virtio-9p-marshal.c | 4 +- gdbstub.c | 12 +- hmp.c | 13 +- hmp.h | 2 +- host-utils.c | 2 +- hw/9pfs/codir.c | 4 +- hw/9pfs/cofile.c | 4 +- hw/9pfs/cofs.c | 4 +- hw/9pfs/coxattr.c | 4 +- hw/9pfs/virtio-9p-coth.c | 5 +- hw/9pfs/virtio-9p-coth.h | 4 +- hw/9pfs/virtio-9p-device.c | 2 +- hw/9pfs/virtio-9p-handle.c | 2 +- hw/9pfs/virtio-9p-local.c | 2 +- hw/9pfs/virtio-9p-posix-acl.c | 2 +- hw/9pfs/virtio-9p-synth.h | 4 + hw/9pfs/virtio-9p-xattr.h | 2 +- hw/9pfs/virtio-9p.c | 4 +- hw/9pfs/virtio-9p.h | 4 +- hw/Makefile.objs | 15 +- hw/ac97.c | 4 +- hw/acpi.c | 4 +- hw/acpi.h | 2 +- hw/acpi_ich9.c | 23 +- hw/acpi_piix4.c | 10 +- hw/adb.c | 2 +- hw/adlib.c | 2 +- hw/ads7846.c | 2 +- hw/alpha_dp264.c | 2 +- hw/alpha_pci.c | 4 +- hw/alpha_sys.h | 5 +- hw/alpha_typhoon.c | 6 +- hw/an5206.c | 2 +- hw/apb_pci.c | 12 +- hw/apic.c | 6 +- hw/apic_common.c | 2 +- hw/apic_internal.h | 4 +- hw/apm.c | 2 +- hw/apm.h | 2 +- hw/applesmc.c | 4 +- hw/arm-misc.h | 2 +- hw/arm11mpcore.c | 2 +- hw/arm_boot.c | 5 +- hw/arm_mptimer.c | 2 +- hw/arm_sysctl.c | 4 +- hw/arm_timer.c | 2 +- hw/armv7m_nvic.c | 4 +- hw/audiodev.h | 5 + hw/axis_dev88.c | 6 +- hw/baum.c | 4 +- hw/baum.h | 4 + hw/blizzard.c | 4 +- hw/block-common.c | 4 +- hw/boards.h | 2 +- hw/bonito.c | 8 +- hw/bt-hci-csr.c | 6 +- hw/bt-hci.c | 4 +- hw/bt-hid.c | 4 +- hw/bt-l2cap.c | 2 +- hw/bt.c | 2 +- hw/bt.h | 5 + hw/cadence_gem.c | 2 +- hw/cadence_ttc.c | 2 +- hw/cadence_uart.c | 4 +- hw/cbus.c | 2 +- hw/ccid-card-emulated.c | 6 +- hw/ccid-card-passthru.c | 6 +- hw/cirrus_vga.c | 4 +- hw/collie.c | 4 +- hw/cris-boot.h | 4 + hw/cs4231a.c | 2 +- hw/cuda.c | 4 +- hw/debugcon.c | 2 +- hw/dec_pci.c | 8 +- hw/device-hotplug.c | 9 +- hw/dma.c | 1 + hw/dp8393x.c | 4 +- hw/dummy_m68k.c | 2 +- hw/e1000.c | 8 +- hw/eepro100.c | 8 +- hw/empty_slot.h | 5 + hw/es1370.c | 4 +- hw/escc.c | 4 +- hw/escc.h | 5 + hw/esp-pci.c | 4 +- hw/esp.c | 2 +- hw/etraxfs.h | 7 +- hw/etraxfs_dma.c | 4 +- hw/etraxfs_dma.h | 5 + hw/etraxfs_eth.c | 2 +- hw/etraxfs_ser.c | 4 +- hw/etraxfs_timer.c | 4 +- hw/exynos4210.c | 2 +- hw/exynos4210.h | 2 +- hw/exynos4210_fimd.c | 8 +- hw/exynos4210_i2c.c | 2 +- hw/exynos4210_mct.c | 2 +- hw/exynos4210_pwm.c | 2 +- hw/exynos4210_rtc.c | 6 +- hw/exynos4210_uart.c | 4 +- hw/exynos4_boards.c | 6 +- hw/fdc.c | 10 +- hw/flash.h | 7 +- hw/framebuffer.c | 2 +- hw/framebuffer.h | 2 +- hw/fw_cfg.c | 5 +- hw/g364fb.c | 4 +- hw/grackle_pci.c | 4 +- hw/grlib_apbuart.c | 2 +- hw/grlib_gptimer.c | 2 +- hw/gt64xxx.c | 6 +- hw/gumstix.c | 6 +- hw/hd-geometry.c | 2 +- hw/hda-audio.c | 2 +- hw/hid.c | 4 +- hw/hid.h | 2 +- hw/highbank.c | 8 +- hw/hpet.c | 4 +- hw/hw.h | 12 +- hw/i386/Makefile.objs | 2 +- hw/i82378.c | 2 +- hw/i8254.c | 2 +- hw/i8254_common.c | 2 +- hw/i8259.c | 4 +- hw/i82801b11.c | 2 +- hw/ich9.h | 10 +- hw/ide.h | 4 +- hw/ide/ahci.c | 10 +- hw/ide/cmd646.c | 8 +- hw/ide/core.c | 12 +- hw/ide/ich.c | 8 +- hw/ide/internal.h | 6 +- hw/ide/isa.c | 4 +- hw/ide/macio.c | 4 +- hw/ide/microdrive.c | 4 +- hw/ide/mmio.c | 4 +- hw/ide/pci.c | 6 +- hw/ide/piix.c | 8 +- hw/ide/qdev.c | 8 +- hw/ide/via.c | 8 +- hw/imx_avic.c | 2 +- hw/imx_ccm.c | 2 +- hw/imx_serial.c | 4 +- hw/imx_timer.c | 2 +- hw/integratorcp.c | 6 +- hw/intel-hda.c | 8 +- hw/ioapic_internal.h | 2 +- hw/ioh3420.c | 6 +- hw/ioh3420.h | 2 +- hw/isa-bus.c | 6 +- hw/isa.h | 4 +- hw/isa_mmio.c | 2 +- hw/ivshmem.c | 13 +- hw/jazz_led.c | 5 +- hw/kvm/apic.c | 4 +- hw/kvm/clock.c | 4 +- hw/kvm/i8254.c | 6 +- hw/kvm/i8259.c | 2 +- hw/kvm/ioapic.c | 2 +- hw/kvm/pci-assign.c | 14 +- hw/kvmvapic.c | 6 +- hw/kzm.c | 6 +- hw/lan9118.c | 4 +- hw/lance.c | 6 +- hw/leon3.c | 8 +- hw/lm32.h | 5 + hw/lm32_boards.c | 5 +- hw/lm32_juart.c | 2 +- hw/lm32_pic.c | 2 +- hw/lm32_sys.c | 8 +- hw/lm32_timer.c | 4 +- hw/lm32_uart.c | 4 +- hw/lm832x.c | 4 +- hw/loader.c | 10 +- hw/lpc_ich9.c | 46 +-- hw/lsi53c895a.c | 4 +- hw/m25p80.c | 2 +- hw/m48t59.c | 6 +- hw/mac_dbdma.c | 1 + hw/mac_dbdma.h | 6 +- hw/mac_nvram.c | 2 +- hw/macio.c | 2 +- hw/mainstone.c | 6 +- hw/mc146818rtc.c | 6 +- hw/mcf5206.c | 6 +- hw/mcf5208.c | 8 +- hw/mcf_fec.c | 4 +- hw/mcf_intc.c | 2 +- hw/mcf_uart.c | 4 +- hw/megasas.c | 8 +- hw/microblaze_boot.c | 6 +- hw/milkymist-ac97.c | 2 +- hw/milkymist-hpdmc.c | 2 +- hw/milkymist-hw.h | 1 + hw/milkymist-memcard.c | 6 +- hw/milkymist-minimac2.c | 4 +- hw/milkymist-pfpu.c | 4 +- hw/milkymist-softusb.c | 4 +- hw/milkymist-sysctl.c | 6 +- hw/milkymist-tmu2.c | 2 +- hw/milkymist-uart.c | 4 +- hw/milkymist-vgafb.c | 6 +- hw/milkymist.c | 7 +- hw/mips.h | 2 +- hw/mips_fulong2e.c | 16 +- hw/mips_jazz.c | 10 +- hw/mips_malta.c | 18 +- hw/mips_mipssim.c | 6 +- hw/mips_r4k.c | 10 +- hw/mips_timer.c | 2 +- hw/mipsnet.c | 2 +- hw/mpc8544_guts.c | 2 +- hw/msmouse.c | 6 +- hw/msmouse.h | 5 + hw/multiboot.c | 2 +- hw/musicpal.c | 17 +- hw/nand.c | 4 +- hw/ne2000-isa.c | 4 +- hw/ne2000.c | 6 +- hw/ne2000.h | 5 + hw/nseries.c | 8 +- hw/omap.h | 2 +- hw/omap1.c | 6 +- hw/omap2.c | 8 +- hw/omap_dma.c | 2 +- hw/omap_dss.c | 2 +- hw/omap_gpmc.c | 4 +- hw/omap_gptimer.c | 2 +- hw/omap_lcdc.c | 5 +- hw/omap_sx1.c | 6 +- hw/omap_synctimer.c | 2 +- hw/omap_uart.c | 4 +- hw/onenand.c | 8 +- hw/opencores_eth.c | 4 +- hw/openpic.c | 4 +- hw/openrisc_sim.c | 8 +- hw/openrisc_timer.c | 2 +- hw/palm.c | 6 +- hw/pam.c | 2 +- hw/pam.h | 2 +- hw/parallel.c | 4 +- hw/pc.c | 20 +- hw/pc.h | 8 +- hw/pc_piix.c | 18 +- hw/pc_q35.c | 6 +- hw/pc_sysfw.c | 6 +- hw/pci/Makefile.objs | 9 + hw/{ => pci}/msi.c | 4 +- hw/{ => pci}/msi.h | 2 +- hw/{ => pci}/msix.c | 10 +- hw/{ => pci}/msix.h | 2 +- hw/{ => pci}/pci-hotplug.c | 22 +- hw/{ => pci}/pci-stub.c | 6 +- hw/{ => pci}/pci.c | 24 +- hw/{ => pci}/pci.h | 14 +- hw/{ => pci}/pci_bridge.c | 6 +- hw/{ => pci}/pci_bridge.h | 2 +- hw/{pci_internals.h => pci/pci_bus.h} | 16 +- hw/{ => pci}/pci_host.c | 4 +- hw/{ => pci}/pci_host.h | 2 +- hw/{ => pci}/pci_ids.h | 4 + hw/{ => pci}/pci_regs.h | 0 hw/{ => pci}/pcie.c | 14 +- hw/{ => pci}/pcie.h | 8 +- hw/{ => pci}/pcie_aer.c | 18 +- hw/{ => pci}/pcie_aer.h | 2 +- hw/{ => pci}/pcie_host.c | 8 +- hw/{ => pci}/pcie_host.h | 4 +- hw/{ => pci}/pcie_port.c | 2 +- hw/{ => pci}/pcie_port.h | 4 +- hw/{ => pci}/pcie_regs.h | 0 hw/{ => pci}/shpc.c | 12 +- hw/{ => pci}/shpc.h | 4 +- hw/{ => pci}/slotid_cap.c | 4 +- hw/{ => pci}/slotid_cap.h | 0 hw/pci_bridge_dev.c | 14 +- hw/pckbd.c | 2 +- hw/pcmcia.h | 5 + hw/pcnet-pci.c | 8 +- hw/pcnet.c | 8 +- hw/pcnet.h | 7 +- hw/pcspk.c | 2 +- hw/petalogix_ml605_mmu.c | 8 +- hw/petalogix_s3adsp1800_mmu.c | 8 +- hw/pflash_cfi01.c | 8 +- hw/pflash_cfi02.c | 8 +- hw/piix4.c | 2 +- hw/piix_pci.c | 6 +- hw/pl011.c | 2 +- hw/pl031.c | 4 +- hw/pl110.c | 5 +- hw/pl181.c | 2 +- hw/ppc.c | 8 +- hw/ppc.h | 5 + hw/ppc/Makefile.objs | 2 +- hw/ppc/e500.c | 12 +- hw/ppc/e500plat.c | 2 +- hw/ppc/mpc8544ds.c | 2 +- hw/ppc405_boards.c | 10 +- hw/ppc405_uc.c | 8 +- hw/ppc440_bamboo.c | 12 +- hw/ppc4xx.h | 2 +- hw/ppc4xx_devs.c | 4 +- hw/ppc4xx_pci.c | 6 +- hw/ppc_booke.c | 6 +- hw/ppc_mac.h | 2 +- hw/ppc_newworld.c | 12 +- hw/ppc_oldworld.c | 12 +- hw/ppc_prep.c | 16 +- hw/ppce500_pci.c | 8 +- hw/ppce500_spin.c | 4 +- hw/prep_pci.c | 6 +- hw/ps2.c | 4 +- hw/ptimer.c | 4 +- hw/ptimer.h | 4 +- hw/puv3.c | 6 +- hw/pxa.h | 2 +- hw/pxa2xx.c | 6 +- hw/pxa2xx_keypad.c | 2 +- hw/pxa2xx_lcd.c | 6 +- hw/pxa2xx_timer.c | 4 +- hw/q35.h | 6 +- hw/qdev-addr.c | 4 +- hw/qdev-addr.h | 5 + hw/qdev-core.h | 10 +- hw/qdev-monitor.c | 5 +- hw/qdev-monitor.h | 2 +- hw/qdev-properties.c | 9 +- hw/qdev.c | 8 +- hw/qxl-logger.c | 2 +- hw/qxl.c | 8 +- hw/qxl.h | 11 +- hw/r2d.c | 10 +- hw/rc4030.c | 2 +- hw/realview.c | 10 +- hw/rtl8139.c | 12 +- hw/s390-virtio-bus.c | 9 +- hw/s390-virtio-bus.h | 4 + hw/s390-virtio.c | 14 +- hw/s390x/event-facility.c | 4 +- hw/s390x/event-facility.h | 2 +- hw/s390x/sclp.c | 4 +- hw/s390x/sclpconsole.c | 3 +- hw/s390x/sclpquiesce.c | 2 +- hw/sb16.c | 4 +- hw/scsi-bus.c | 6 +- hw/scsi-defs.h | 4 + hw/scsi-disk.c | 8 +- hw/scsi-generic.c | 4 +- hw/scsi.h | 4 +- hw/sd.c | 4 +- hw/serial-pci.c | 2 +- hw/serial.c | 6 +- hw/serial.h | 8 +- hw/sga.c | 4 +- hw/sh7750.c | 4 +- hw/sh_intc.h | 2 +- hw/sh_pci.c | 8 +- hw/sh_serial.c | 4 +- hw/sh_timer.c | 4 +- hw/shix.c | 4 +- hw/slavio_intctl.c | 2 +- hw/slavio_misc.c | 2 +- hw/slavio_timer.c | 2 +- hw/sm501.c | 7 +- hw/smbios.c | 2 +- hw/smbus_ich9.c | 18 +- hw/smc91c111.c | 2 +- hw/soc_dma.c | 2 +- hw/soc_dma.h | 8 +- hw/spapr.c | 18 +- hw/spapr.h | 2 +- hw/spapr_events.c | 6 +- hw/spapr_hcall.c | 6 +- hw/spapr_iommu.c | 6 +- hw/spapr_llan.c | 2 +- hw/spapr_nvram.c | 2 +- hw/spapr_pci.c | 12 +- hw/spapr_pci.h | 4 +- hw/spapr_rtas.c | 6 +- hw/spapr_vio.c | 8 +- hw/spapr_vio.h | 2 +- hw/spapr_vscsi.c | 1 - hw/spapr_vty.c | 2 +- hw/spitz.c | 12 +- hw/ssd0303.c | 2 +- hw/ssd0323.c | 2 +- hw/ssi-sd.c | 2 +- hw/stellaris.c | 6 +- hw/stellaris_enet.c | 2 +- hw/stellaris_input.c | 2 +- hw/stream.h | 2 +- hw/strongarm.c | 5 +- hw/strongarm.h | 2 +- hw/sun4c_intctl.c | 2 +- hw/sun4m.c | 8 +- hw/sun4u.c | 12 +- hw/sysbus.c | 4 +- hw/sysbus.h | 2 +- hw/tc6393xb.c | 6 +- hw/tcx.c | 5 +- hw/tosa.c | 6 +- hw/tsc2005.c | 4 +- hw/tsc210x.c | 4 +- hw/tusb6010.c | 2 +- hw/twl92230.c | 6 +- uboot_image.h => hw/uboot_image.h | 0 hw/unin_pci.c | 4 +- hw/usb.h | 2 +- hw/usb/bus.c | 4 +- hw/usb/combined-packet.c | 2 +- hw/usb/core.c | 2 +- hw/usb/dev-bluetooth.c | 2 +- hw/usb/dev-hid.c | 4 +- hw/usb/dev-network.c | 9 +- hw/usb/dev-serial.c | 4 +- hw/usb/dev-smartcard-reader.c | 4 +- hw/usb/dev-storage.c | 12 +- hw/usb/dev-uas.c | 4 +- hw/usb/dev-wacom.c | 2 +- hw/usb/hcd-ehci-pci.c | 4 +- hw/usb/hcd-ehci.h | 12 +- hw/usb/hcd-musb.c | 2 +- hw/usb/hcd-ohci.c | 4 +- hw/usb/hcd-uhci.c | 8 +- hw/usb/hcd-xhci.c | 8 +- hw/usb/host-bsd.c | 2 +- hw/usb/host-linux.c | 6 +- hw/usb/host-stub.c | 4 +- hw/usb/libhw.c | 4 +- hw/usb/redirect.c | 8 +- hw/versatile_pci.c | 6 +- hw/versatilepb.c | 10 +- hw/vexpress.c | 8 +- hw/vfio_pci.c | 20 +- hw/vga-isa-mm.c | 6 +- hw/vga-isa.c | 6 +- hw/vga-pci.c | 8 +- hw/vga.c | 8 +- hw/vga_int.h | 8 +- hw/vhost.c | 4 +- hw/vhost.h | 2 +- hw/vhost_net.c | 4 +- hw/vhost_net.h | 2 +- hw/virtex_ml507.c | 11 +- hw/virtio-balloon.c | 8 +- hw/virtio-balloon.h | 2 +- hw/virtio-blk.c | 4 +- hw/virtio-console.c | 4 +- hw/virtio-net.c | 8 +- hw/virtio-net.h | 30 +- hw/virtio-pci.c | 15 +- hw/virtio-rng.c | 2 +- hw/virtio-scsi.h | 3 +- hw/virtio-serial-bus.c | 6 +- hw/virtio.c | 4 +- hw/virtio.h | 6 +- hw/vmmouse.c | 2 +- hw/vmport.c | 2 +- hw/vmware_vga.c | 4 +- hw/vt82c686.c | 10 +- hw/watchdog.c | 12 +- hw/watchdog.h | 2 +- hw/wdt_i6300esb.c | 4 +- hw/wdt_ib700.c | 2 +- hw/xen-host-pci-device.h | 2 +- hw/xen_apic.c | 2 +- hw/xen_backend.c | 4 +- hw/xen_backend.h | 5 +- hw/xen_common.h | 2 +- hw/xen_console.c | 2 +- hw/xen_devconfig.c | 2 +- hw/xen_disk.c | 3 +- hw/xen_domainbuild.c | 4 +- hw/xen_machine_pv.c | 2 +- hw/xen_nic.c | 3 +- hw/xen_platform.c | 5 +- hw/xen_pt.c | 6 +- hw/xen_pt.h | 2 +- hw/xen_pt_config_init.c | 2 +- hw/xenfb.c | 4 +- hw/xgmac.c | 6 +- hw/xilinx.h | 8 +- hw/xilinx_axidma.c | 5 +- hw/xilinx_axienet.c | 5 +- hw/xilinx_ethlite.c | 2 +- hw/xilinx_spi.c | 4 +- hw/xilinx_spips.c | 6 +- hw/xilinx_timer.c | 2 +- hw/xilinx_uartlite.c | 2 +- hw/xilinx_zynq.c | 8 +- hw/xio3130_downstream.c | 6 +- hw/xio3130_downstream.h | 2 +- hw/xio3130_upstream.c | 6 +- hw/xio3130_upstream.h | 2 +- hw/xtensa_lx60.c | 11 +- hw/xtensa_pic.c | 4 +- hw/xtensa_sim.c | 6 +- hw/z2.c | 8 +- hw/zynq_slcr.c | 4 +- aes.h => include/block/aes.h | 0 qemu-aio.h => include/block/aio.h | 4 +- block.h => include/block/block.h | 8 +- block_int.h => include/block/block_int.h | 14 +- blockjob.h => include/block/blockjob.h | 2 +- qemu-coroutine.h => include/block/coroutine.h | 4 +- .../block/coroutine_int.h | 4 +- nbd.h => include/block/nbd.h | 0 thread-pool.h => include/block/thread-pool.h | 8 +- include/bt/bt.h | 20 + qemu-char.h => include/char/char.h | 14 +- config.h => include/config.h | 0 dis-asm.h => include/disas/bfd.h | 0 disas.h => include/disas/disas.h | 0 elf.h => include/elf.h | 0 exec-memory.h => include/exec/address-spaces.h | 2 +- cpu-all.h => include/exec/cpu-all.h | 6 +- cpu-common.h => include/exec/cpu-common.h | 8 +- cpu-defs.h => include/exec/cpu-defs.h | 6 +- cputlb.h => include/exec/cputlb.h | 0 def-helper.h => include/exec/def-helper.h | 0 exec-all.h => include/exec/exec-all.h | 14 +- gdbstub.h => include/exec/gdbstub.h | 0 gen-icount.h => include/exec/gen-icount.h | 7 +- hwaddr.h => include/exec/hwaddr.h | 0 ioport.h => include/exec/ioport.h | 2 +- iorange.h => include/exec/iorange.h | 0 .../exec/memory-internal.h | 0 memory.h => include/exec/memory.h | 12 +- poison.h => include/exec/poison.h | 0 softmmu-semi.h => include/exec/softmmu-semi.h | 4 + softmmu_defs.h => include/exec/softmmu_defs.h | 0 softmmu_exec.h => include/exec/softmmu_exec.h | 58 +-- softmmu_header.h => include/exec/softmmu_header.h | 0 .../exec/softmmu_template.h | 4 +- qemu-lock.h => include/exec/spinlock.h | 0 qemu-user-types.h => include/exec/user/abitypes.h | 0 thunk.h => include/exec/user/thunk.h | 0 {fpu => include/fpu}/softfloat.h | 2 +- libfdt_env.h => include/libfdt_env.h | 2 +- block-migration.h => include/migration/block.h | 0 migration.h => include/migration/migration.h | 8 +- include/{qemu => migration}/page_cache.h | 0 qemu-file.h => include/migration/qemu-file.h | 0 vmstate.h => include/migration/vmstate.h | 0 monitor.h => include/monitor/monitor.h | 9 +- readline.h => include/monitor/readline.h | 0 {net => include/net}/checksum.h | 0 net.h => include/net/net.h | 25 +- {net => include/net}/queue.h | 0 {net => include/net}/slirp.h | 4 +- include/net/tap.h | 67 ++++ .../qapi/dealloc-visitor.h | 2 +- error.h => include/qapi/error.h | 2 +- {qapi => include/qapi}/opts-visitor.h | 4 +- {qapi => include/qapi}/qmp-input-visitor.h | 4 +- {qapi => include/qapi}/qmp-output-visitor.h | 4 +- qapi/qmp-core.h => include/qapi/qmp/dispatch.h | 6 +- json-lexer.h => include/qapi/qmp/json-lexer.h | 4 +- json-parser.h => include/qapi/qmp/json-parser.h | 4 +- .../qapi/qmp/json-streamer.h | 4 +- qbool.h => include/qapi/qmp/qbool.h | 2 +- qdict.h => include/qapi/qmp/qdict.h | 6 +- qerror.h => include/qapi/qmp/qerror.h | 8 +- qfloat.h => include/qapi/qmp/qfloat.h | 2 +- qint.h => include/qapi/qmp/qint.h | 2 +- qjson.h => include/qapi/qmp/qjson.h | 6 +- qlist.h => include/qapi/qmp/qlist.h | 6 +- qobject.h => include/qapi/qmp/qobject.h | 0 qstring.h => include/qapi/qmp/qstring.h | 2 +- qemu-objects.h => include/qapi/qmp/types.h | 16 +- {qapi => include/qapi}/string-input-visitor.h | 2 +- {qapi => include/qapi}/string-output-visitor.h | 2 +- include/qapi/visitor-impl.h | 63 +++ qapi/qapi-visit-core.h => include/qapi/visitor.h | 42 +- qemu-common.h => include/qemu-common.h | 14 +- acl.h => include/qemu/acl.h | 2 +- qemu-barrier.h => include/qemu/atomic.h | 2 +- bitmap.h => include/qemu/bitmap.h | 2 +- bitops.h => include/qemu/bitops.h | 0 bswap.h => include/qemu/bswap.h | 2 +- cache-utils.h => include/qemu/cache-utils.h | 0 compatfd.h => include/qemu/compatfd.h | 0 compiler.h => include/qemu/compiler.h | 0 qemu-config.h => include/qemu/config-file.h | 5 +- envlist.h => include/qemu/envlist.h | 0 qemu-error.h => include/qemu/error-report.h | 0 event_notifier.h => include/qemu/event_notifier.h | 0 host-utils.h => include/qemu/host-utils.h | 6 +- int128.h => include/qemu/int128.h | 0 iov.h => include/qemu/iov.h | 5 + qemu-log.h => include/qemu/log.h | 2 +- main-loop.h => include/qemu/main-loop.h | 2 +- module.h => include/qemu/module.h | 0 notify.h => include/qemu/notify.h | 2 +- qemu-option.h => include/qemu/option.h | 6 +- .../qemu/option_int.h | 3 +- osdep.h => include/qemu/osdep.h | 0 qemu-queue.h => include/qemu/queue.h | 2 +- range.h => include/qemu/range.h | 0 include/qemu/rng-random.h | 2 +- include/qemu/rng.h | 4 +- qemu_socket.h => include/qemu/sockets.h | 6 +- qemu-thread-posix.h => include/qemu/thread-posix.h | 0 qemu-thread-win32.h => include/qemu/thread-win32.h | 0 qemu-thread.h => include/qemu/thread.h | 4 +- qemu-timer.h => include/qemu/timer.h | 4 +- qemu-tls.h => include/qemu/tls.h | 0 qemu-types.h => include/qemu/typedefs.h | 0 uri.h => include/qemu/uri.h | 0 qemu-xattr.h => include/qemu/xattr.h | 0 include/{qemu => qom}/cpu.h | 4 +- include/{qemu => qom}/object.h | 2 +- include/{qemu => qom}/qom-qobject.h | 2 +- arch_init.h => include/sysemu/arch_init.h | 0 balloon.h => include/sysemu/balloon.h | 2 +- blockdev.h => include/sysemu/blockdev.h | 6 +- cpus.h => include/sysemu/cpus.h | 0 device_tree.h => include/sysemu/device_tree.h | 0 dma.h => include/sysemu/dma.h | 6 +- dump.h => include/sysemu/dump.h | 0 kvm.h => include/sysemu/kvm.h | 2 +- .../sysemu/memory_mapping.h | 2 +- qemu-os-posix.h => include/sysemu/os-posix.h | 0 qemu-os-win32.h => include/sysemu/os-win32.h | 0 qtest.h => include/sysemu/qtest.h | 0 qemu-seccomp.h => include/sysemu/seccomp.h | 2 +- sysemu.h => include/sysemu/sysemu.h | 12 +- xen-mapcache.h => include/sysemu/xen-mapcache.h | 0 console.h => include/ui/console.h | 11 +- {hw => include/ui}/pixel_ops.h | 0 qemu-pixman.h => include/ui/qemu-pixman.h | 0 {ui => include/ui}/qemu-spice.h | 9 +- {ui => include/ui}/spice-display.h | 6 +- iohandler.c | 7 +- ioport.c | 4 +- iov.c | 2 +- json-lexer.c | 10 +- json-parser.c | 18 +- json-streamer.c | 10 +- kvm-all.c | 24 +- kvm-stub.c | 6 +- alpha.ld => ldscripts/alpha.ld | 0 arm.ld => ldscripts/arm.ld | 0 hppa.ld => ldscripts/hppa.ld | 0 i386.ld => ldscripts/i386.ld | 0 ia64.ld => ldscripts/ia64.ld | 0 m68k.ld => ldscripts/m68k.ld | 0 mips.ld => ldscripts/mips.ld | 0 ppc.ld => ldscripts/ppc.ld | 0 ppc64.ld => ldscripts/ppc64.ld | 0 s390.ld => ldscripts/s390.ld | 0 sparc.ld => ldscripts/sparc.ld | 0 sparc64.ld => ldscripts/sparc64.ld | 0 x86_64.ld => ldscripts/x86_64.ld | 0 libcacard/event.c | 2 +- libcacard/vreader.c | 2 +- libcacard/vscclient.c | 4 +- linux-user/arm/nwfpe/double_cpdo.c | 2 +- linux-user/arm/nwfpe/extended_cpdo.c | 2 +- linux-user/arm/nwfpe/fpa11.h | 2 +- linux-user/arm/nwfpe/fpa11_cpdt.c | 2 +- linux-user/arm/nwfpe/fpa11_cprt.c | 2 +- linux-user/arm/nwfpe/fpopcode.c | 2 +- linux-user/arm/nwfpe/single_cpdo.c | 2 +- linux-user/cris/syscall.h | 5 + linux-user/elfload.c | 2 +- linux-user/main.c | 6 +- linux-user/microblaze/syscall.h | 6 + linux-user/qemu.h | 10 +- linux-user/syscall.c | 2 +- linux-user/syscall_defs.h | 6 + main-loop.c | 8 +- memory.c | 12 +- memory_mapping-stub.c | 4 +- memory_mapping.c | 4 +- migration-exec.c | 7 +- migration-fd.c | 11 +- migration-tcp.c | 7 +- migration-unix.c | 7 +- migration.c | 12 +- module.c | 4 +- monitor.c | 52 +-- nbd.c | 10 +- net/Makefile.objs | 2 +- net/clients.h | 2 +- net/dump.c | 6 +- net/hub.c | 6 +- net/hub.h | 2 - net.c => net/net.c | 17 +- net/queue.c | 4 +- net/slirp.c | 7 +- net/socket.c | 13 +- net/tap-aix.c | 2 +- net/tap-bsd.c | 6 +- net/tap-haiku.c | 2 +- net/tap-linux.c | 15 +- net/tap-linux.h | 20 +- net/tap-solaris.c | 6 +- net/tap-win32.c | 8 +- net/tap.c | 13 +- net/{tap.h => tap_int.h} | 18 +- net/util.c | 2 +- net/vde.c | 5 +- notify.c | 2 +- os-posix.c | 2 +- os-win32.c | 2 +- osdep.c | 4 +- oslib-posix.c | 4 +- oslib-win32.c | 6 +- page_cache.c | 2 +- pixman | 2 +- qapi/opts-visitor.c | 10 +- qapi/qapi-dealloc-visitor.c | 7 +- qapi/qapi-types-core.h | 21 - qapi/qapi-visit-core.c | 6 +- qapi/qapi-visit-impl.h | 23 -- qapi/qmp-dispatch.c | 10 +- qapi/qmp-input-visitor.c | 10 +- qapi/qmp-output-visitor.c | 10 +- qapi/qmp-registry.c | 2 +- qapi/string-input-visitor.c | 6 +- qapi/string-output-visitor.c | 6 +- qbool.c | 4 +- qdict.c | 14 +- qemu-bridge-helper.c | 2 +- qemu-char.c | 13 +- qemu-config.c | 8 +- qemu-coroutine-io.c | 6 +- qemu-coroutine-lock.c | 8 +- qemu-coroutine-sleep.c | 4 +- qemu-coroutine.c | 4 +- qemu-error.c | 2 +- qemu-img.c | 12 +- qemu-io.c | 4 +- qemu-log.c | 2 +- qemu-nbd.c | 4 +- qemu-option.c | 10 +- qemu-progress.c | 4 +- qemu-seccomp.c | 2 +- qemu-sockets.c | 6 +- qemu-thread-posix.c | 2 +- qemu-thread-win32.c | 2 +- qemu-timer-common.c | 2 +- qemu-timer.c | 11 +- qemu-tool.c | 14 +- qemu-user.c | 2 +- qerror.c | 6 +- qfloat.c | 4 +- qga/Makefile.objs | 2 +- qga/channel-posix.c | 4 +- qga/commands-posix.c | 6 +- qga/commands-win32.c | 2 +- qga/commands.c | 2 +- qga/guest-agent-core.h | 2 +- qemu-ga.c => qga/main.c | 14 +- qapi-schema-guest.json => qga/qapi-schema.json | 0 qint.c | 4 +- qjson.c | 18 +- qlist.c | 6 +- qmp.c | 11 +- qom/container.c | 4 +- qom/cpu.c | 2 +- qom/object.c | 15 +- qom/qom-qobject.c | 6 +- qstring.c | 4 +- qtest.c | 12 +- readline.c | 4 +- rules.mak | 5 +- savevm.c | 23 +- scripts/feature_to_c.sh | 2 +- scripts/get_maintainer.pl | 25 +- scripts/qapi-commands.py | 15 +- scripts/qapi-types.py | 2 +- scripts/qapi-visit.py | 3 +- slirp/bootp.h | 4 + slirp/if.c | 2 +- slirp/ip_input.c | 2 +- slirp/main.h | 4 + slirp/misc.c | 4 +- slirp/sbuf.c | 2 +- slirp/slirp.c | 4 +- slirp/slirp.h | 4 +- slirp/tftp.h | 4 + spice-qemu-char.c | 3 +- stubs/arch-query-cpu-def.c | 4 +- stubs/fd-register.c | 2 +- stubs/fdset-add-fd.c | 2 +- stubs/fdset-find-fd.c | 2 +- stubs/fdset-get-fd.c | 2 +- stubs/fdset-remove-fd.c | 2 +- stubs/get-fd.c | 2 +- stubs/set-fd-handler.c | 2 +- target-alpha/cpu-qom.h | 2 +- target-alpha/cpu.h | 8 +- target-alpha/fpu_helper.c | 2 +- target-alpha/helper.c | 2 +- target-alpha/helper.h | 4 +- target-alpha/int_helper.c | 2 +- target-alpha/mem_helper.c | 10 +- target-alpha/sys_helper.c | 4 +- target-alpha/translate.c | 8 +- target-arm/arm-semi.c | 4 +- target-arm/cpu-qom.h | 2 +- target-arm/cpu.c | 2 +- target-arm/cpu.h | 8 +- target-arm/helper.c | 8 +- target-arm/helper.h | 4 +- target-arm/iwmmxt_helper.c | 2 +- target-arm/neon_helper.c | 2 +- target-arm/op_helper.c | 10 +- target-arm/translate.c | 6 +- target-cris/cpu-qom.h | 2 +- target-cris/cpu.h | 6 +- target-cris/crisv32-decode.h | 4 + target-cris/helper.c | 2 +- target-cris/helper.h | 4 +- target-cris/op_helper.c | 12 +- target-cris/translate.c | 4 +- target-i386/arch_dump.c | 4 +- target-i386/arch_memory_mapping.c | 4 +- target-i386/cpu-qom.h | 4 +- target-i386/cpu.c | 13 +- target-i386/cpu.h | 8 +- target-i386/excp_helper.c | 4 +- target-i386/fpu_helper.c | 2 +- target-i386/helper.c | 6 +- target-i386/helper.h | 4 +- target-i386/int_helper.c | 2 +- target-i386/ioport-user.c | 2 +- target-i386/kvm.c | 13 +- target-i386/kvm_i386.h | 2 +- target-i386/machine.c | 2 +- target-i386/mem_helper.c | 10 +- target-i386/misc_helper.c | 4 +- target-i386/seg_helper.c | 4 +- target-i386/svm_helper.c | 4 +- target-i386/translate.c | 4 +- target-lm32/cpu-qom.h | 2 +- target-lm32/cpu.h | 6 +- target-lm32/helper.c | 2 +- target-lm32/helper.h | 4 +- target-lm32/op_helper.c | 10 +- target-lm32/translate.c | 4 +- target-m68k/cpu-qom.h | 2 +- target-m68k/cpu.h | 8 +- target-m68k/helper.c | 2 +- target-m68k/helpers.h | 4 +- target-m68k/m68k-semi.c | 6 +- target-m68k/op_helper.c | 10 +- target-m68k/translate.c | 6 +- target-microblaze/cpu-qom.h | 2 +- target-microblaze/cpu.h | 8 +- target-microblaze/helper.c | 4 +- target-microblaze/helper.h | 4 +- target-microblaze/op_helper.c | 12 +- target-microblaze/translate.c | 4 +- target-mips/cpu-qom.h | 2 +- target-mips/cpu.h | 8 +- target-mips/helper.h | 4 +- target-mips/op_helper.c | 12 +- target-mips/translate.c | 4 +- target-openrisc/cpu.h | 12 +- target-openrisc/helper.h | 4 +- target-openrisc/int_helper.c | 2 +- target-openrisc/interrupt.c | 4 +- target-openrisc/mmu.c | 4 +- target-openrisc/mmu_helper.c | 10 +- target-openrisc/translate.c | 10 +- target-ppc/cpu-qom.h | 2 +- target-ppc/cpu.h | 8 +- target-ppc/helper.c | 4 +- target-ppc/helper.h | 4 +- target-ppc/int_helper.c | 2 +- target-ppc/kvm.c | 10 +- target-ppc/kvm_ppc.c | 4 +- target-ppc/kvm_ppc.h | 2 +- target-ppc/machine.c | 2 +- target-ppc/mem_helper.c | 12 +- target-ppc/mmu_helper.c | 2 +- target-ppc/translate.c | 6 +- target-ppc/translate_init.c | 8 +- target-s390x/cpu-qom.h | 2 +- target-s390x/cpu.c | 2 +- target-s390x/cpu.h | 8 +- target-s390x/fpu_helper.c | 2 +- target-s390x/helper.c | 6 +- target-s390x/helper.h | 4 +- target-s390x/int_helper.c | 2 +- target-s390x/interrupt.c | 2 +- target-s390x/kvm.c | 8 +- target-s390x/mem_helper.c | 10 +- target-s390x/misc_helper.c | 12 +- target-s390x/translate.c | 6 +- target-sh4/cpu-qom.h | 2 +- target-sh4/cpu.h | 10 +- target-sh4/helper.h | 4 +- target-sh4/op_helper.c | 10 +- target-sh4/translate.c | 4 +- target-sparc/cpu-qom.h | 2 +- target-sparc/cpu.h | 10 +- target-sparc/helper.c | 4 +- target-sparc/helper.h | 4 +- target-sparc/int32_helper.c | 2 +- target-sparc/ldst_helper.c | 10 +- target-sparc/machine.c | 2 +- target-sparc/mmu_helper.c | 2 +- target-sparc/translate.c | 4 +- target-unicore32/cpu-qom.h | 2 +- target-unicore32/cpu.h | 8 +- target-unicore32/helper.c | 6 +- target-unicore32/helper.h | 4 +- target-unicore32/op_helper.c | 8 +- target-unicore32/translate.c | 6 +- target-xtensa/core-dc232b.c | 6 +- target-xtensa/core-dc233c.c | 6 +- target-xtensa/core-fsf.c | 6 +- target-xtensa/cpu-qom.h | 2 +- target-xtensa/cpu.h | 6 +- target-xtensa/helper.c | 6 +- target-xtensa/helper.h | 4 +- target-xtensa/op_helper.c | 10 +- target-xtensa/translate.c | 10 +- target-xtensa/xtensa-semi.c | 2 +- tcg/arm/tcg-target.c | 2 +- tcg/arm/tcg-target.h | 3 + tcg/hppa/tcg-target.c | 2 +- tcg/hppa/tcg-target.h | 3 + tcg/i386/tcg-target.c | 2 +- tcg/i386/tcg-target.h | 3 + tcg/ia64/tcg-target.c | 2 +- tcg/ia64/tcg-target.h | 3 + tcg/mips/tcg-target.c | 2 +- tcg/mips/tcg-target.h | 3 + tcg/ppc/tcg-target.c | 2 +- tcg/ppc/tcg-target.h | 3 + tcg/ppc64/tcg-target.c | 2 +- tcg/ppc64/tcg-target.h | 3 + tcg/s390/tcg-target.c | 2 +- tcg/s390/tcg-target.h | 3 + tcg/sparc/tcg-target.c | 2 +- tcg/sparc/tcg-target.h | 3 + tcg/tcg.c | 6 +- tci.c | 2 +- tests/check-qdict.c | 6 +- tests/check-qfloat.c | 2 +- tests/check-qint.c | 2 +- tests/check-qjson.c | 14 +- tests/check-qlist.c | 4 +- tests/check-qstring.c | 2 +- tests/libqtest.c | 4 +- tests/tcg/cris/crisutils.h | 5 + tests/tcg/test-i386-fprem.c | 4 +- tests/tcg/test-i386.c | 2 +- tests/test-aio.c | 2 +- tests/test-coroutine.c | 2 +- tests/test-iov.c | 4 +- tests/test-qmp-commands.c | 6 +- tests/test-qmp-input-strict.c | 2 +- tests/test-qmp-input-visitor.c | 2 +- tests/test-qmp-output-visitor.c | 2 +- tests/test-string-input-visitor.c | 2 +- tests/test-string-output-visitor.c | 2 +- tests/test-thread-pool.c | 6 +- tests/test-visitor-serialization.c | 2 +- thread-pool.c | 14 +- thunk.c | 2 +- trace/simple.c | 2 +- translate-all.c | 10 +- ui/Makefile.objs | 7 +- ui/cocoa.m | 4 +- console.c => ui/console.c | 5 +- ui/curses.c | 4 +- ui/curses_keys.h | 5 + cursor.c => ui/cursor.c | 2 +- cursor_hidden.xpm => ui/cursor_hidden.xpm | 0 cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm | 0 ui/d3des.h | 4 + input.c => ui/input.c | 9 +- ui/keymaps.c | 2 +- qemu-pixman.c => ui/qemu-pixman.c | 2 +- qemu-x509.h => ui/qemu-x509.h | 0 ui/sdl.c | 4 +- ui/sdl_zoom.c | 2 +- ui/spice-core.c | 28 +- ui/spice-display.c | 14 +- ui/spice-input.c | 4 +- vgafont.h => ui/vgafont.h | 0 ui/vnc-auth-sasl.h | 2 +- ui/vnc-enc-tight.c | 4 +- ui/vnc-jobs.c | 2 +- ui/vnc-palette.h | 4 +- ui/vnc-tls.c | 2 +- ui/vnc-tls.h | 2 +- ui/vnc.c | 12 +- ui/vnc.h | 10 +- uri.c | 2 +- user-exec.c | 2 +- vl.c | 54 +-- xen-all.c | 8 +- xen-mapcache.c | 6 +- xen-stub.c | 2 +- 1124 files changed, 3142 insertions(+), 3427 deletions(-) delete mode 100644 Makefile.dis delete mode 100644 Makefile.user delete mode 100644 a.out.h delete mode 100644 bt-host.h create mode 100644 disas/Makefile.objs rename alpha-dis.c => disas/alpha.c (99%) rename arm-dis.c => disas/arm.c (99%) rename cris-dis.c => disas/cris.c (99%) rename hppa-dis.c => disas/hppa.c (99%) rename i386-dis.c => disas/i386.c (99%) rename ia64-dis.c => disas/ia64.c (99%) rename lm32-dis.c => disas/lm32.c (99%) rename m68k-dis.c => disas/m68k.c (99%) rename microblaze-dis.c => disas/microblaze.c (99%) rename mips-dis.c => disas/mips.c (99%) rename ppc-dis.c => disas/ppc.c (99%) rename s390-dis.c => disas/s390.c (99%) rename sh4-dis.c => disas/sh4.c (99%) rename sparc-dis.c => disas/sparc.c (99%) rename tci-dis.c => disas/tci.c (98%) create mode 100644 hw/pci/Makefile.objs rename hw/{ => pci}/msi.c (99%) rename hw/{ => pci}/msi.h (98%) rename hw/{ => pci}/msix.c (99%) rename hw/{ => pci}/msix.h (98%) rename hw/{ => pci}/pci-hotplug.c (96%) rename hw/{ => pci}/pci-stub.c (94%) rename hw/{ => pci}/pci.c (99%) rename hw/{ => pci}/pci.h (99%) rename hw/{ => pci}/pci_bridge.c (99%) rename hw/{ => pci}/pci_bridge.h (98%) rename hw/{pci_internals.h => pci/pci_bus.h} (79%) rename hw/{ => pci}/pci_host.c (99%) rename hw/{ => pci}/pci_host.h (99%) rename hw/{ => pci}/pci_ids.h (98%) rename hw/{ => pci}/pci_regs.h (100%) rename hw/{ => pci}/pcie.c (99%) rename hw/{ => pci}/pcie.h (98%) rename hw/{ => pci}/pcie_aer.c (99%) rename hw/{ => pci}/pcie_aer.h (99%) rename hw/{ => pci}/pcie_host.c (97%) rename hw/{ => pci}/pcie_host.h (96%) rename hw/{ => pci}/pcie_port.c (99%) rename hw/{ => pci}/pcie_port.h (96%) rename hw/{ => pci}/pcie_regs.h (100%) rename hw/{ => pci}/shpc.c (99%) rename hw/{ => pci}/shpc.h (95%) rename hw/{ => pci}/slotid_cap.c (95%) rename hw/{ => pci}/slotid_cap.h (100%) rename uboot_image.h => hw/uboot_image.h (100%) rename aes.h => include/block/aes.h (100%) rename qemu-aio.h => include/block/aio.h (99%) rename block.h => include/block/block.h (99%) rename block_int.h => include/block/block_int.h (98%) rename blockjob.h => include/block/blockjob.h (99%) rename qemu-coroutine.h => include/block/coroutine.h (99%) rename qemu-coroutine-int.h => include/block/coroutine_int.h (96%) rename nbd.h => include/block/nbd.h (100%) rename thread-pool.h => include/block/thread-pool.h (88%) create mode 100644 include/bt/bt.h rename qemu-char.h => include/char/char.h (97%) rename config.h => include/config.h (100%) rename dis-asm.h => include/disas/bfd.h (100%) rename disas.h => include/disas/disas.h (100%) rename elf.h => include/elf.h (100%) rename exec-memory.h => include/exec/address-spaces.h (97%) rename cpu-all.h => include/exec/cpu-all.h (99%) rename cpu-common.h => include/exec/cpu-common.h (97%) rename cpu-defs.h => include/exec/cpu-defs.h (99%) rename cputlb.h => include/exec/cputlb.h (100%) rename def-helper.h => include/exec/def-helper.h (100%) rename exec-all.h => include/exec/exec-all.h (98%) rename gdbstub.h => include/exec/gdbstub.h (100%) rename gen-icount.h => include/exec/gen-icount.h (94%) rename hwaddr.h => include/exec/hwaddr.h (100%) rename ioport.h => include/exec/ioport.h (99%) rename iorange.h => include/exec/iorange.h (100%) rename memory-internal.h => include/exec/memory-internal.h (100%) rename memory.h => include/exec/memory.h (99%) rename poison.h => include/exec/poison.h (100%) rename softmmu-semi.h => include/exec/softmmu-semi.h (97%) rename softmmu_defs.h => include/exec/softmmu_defs.h (100%) rename softmmu_exec.h => include/exec/softmmu_exec.h (72%) rename softmmu_header.h => include/exec/softmmu_header.h (100%) rename softmmu_template.h => include/exec/softmmu_template.h (99%) rename qemu-lock.h => include/exec/spinlock.h (100%) rename qemu-user-types.h => include/exec/user/abitypes.h (100%) rename thunk.h => include/exec/user/thunk.h (100%) rename {fpu => include/fpu}/softfloat.h (99%) rename libfdt_env.h => include/libfdt_env.h (97%) rename block-migration.h => include/migration/block.h (100%) rename migration.h => include/migration/migration.h (97%) rename include/{qemu => migration}/page_cache.h (100%) rename qemu-file.h => include/migration/qemu-file.h (100%) rename vmstate.h => include/migration/vmstate.h (100%) rename monitor.h => include/monitor/monitor.h (96%) rename readline.h => include/monitor/readline.h (100%) rename {net => include/net}/checksum.h (100%) rename net.h => include/net/net.h (90%) rename {net => include/net}/queue.h (100%) rename {net => include/net}/slirp.h (96%) create mode 100644 include/net/tap.h rename qapi/qapi-dealloc-visitor.h => include/qapi/dealloc-visitor.h (95%) rename error.h => include/qapi/error.h (98%) rename {qapi => include/qapi}/opts-visitor.h (93%) rename {qapi => include/qapi}/qmp-input-visitor.h (91%) rename {qapi => include/qapi}/qmp-output-visitor.h (91%) rename qapi/qmp-core.h => include/qapi/qmp/dispatch.h (93%) rename json-lexer.h => include/qapi/qmp/json-lexer.h (94%) rename json-parser.h => include/qapi/qmp/json-parser.h (90%) rename json-streamer.h => include/qapi/qmp/json-streamer.h (93%) rename qbool.h => include/qapi/qmp/qbool.h (94%) rename qdict.h => include/qapi/qmp/qdict.h (96%) rename qerror.h => include/qapi/qmp/qerror.h (98%) rename qfloat.h => include/qapi/qmp/qfloat.h (94%) rename qint.h => include/qapi/qmp/qint.h (94%) rename qjson.h => include/qapi/qmp/qjson.h (88%) rename qlist.h => include/qapi/qmp/qlist.h (95%) rename qobject.h => include/qapi/qmp/qobject.h (100%) rename qstring.h => include/qapi/qmp/qstring.h (96%) rename qemu-objects.h => include/qapi/qmp/types.h (60%) rename {qapi => include/qapi}/string-input-visitor.h (95%) rename {qapi => include/qapi}/string-output-visitor.h (95%) create mode 100644 include/qapi/visitor-impl.h rename qapi/qapi-visit-core.h => include/qapi/visitor.h (52%) rename qemu-common.h => include/qemu-common.h (98%) rename acl.h => include/qemu/acl.h (98%) rename qemu-barrier.h => include/qemu/atomic.h (96%) rename bitmap.h => include/qemu/bitmap.h (99%) rename bitops.h => include/qemu/bitops.h (100%) rename bswap.h => include/qemu/bswap.h (99%) rename cache-utils.h => include/qemu/cache-utils.h (100%) rename compatfd.h => include/qemu/compatfd.h (100%) rename compiler.h => include/qemu/compiler.h (100%) rename qemu-config.h => include/qemu/config-file.h (91%) rename envlist.h => include/qemu/envlist.h (100%) rename qemu-error.h => include/qemu/error-report.h (100%) rename event_notifier.h => include/qemu/event_notifier.h (100%) rename host-utils.h => include/qemu/host-utils.h (98%) rename int128.h => include/qemu/int128.h (100%) rename iov.h => include/qemu/iov.h (99%) rename qemu-log.h => include/qemu/log.h (99%) rename main-loop.h => include/qemu/main-loop.h (99%) rename module.h => include/qemu/module.h (100%) rename notify.h => include/qemu/notify.h (97%) rename qemu-option.h => include/qemu/option.h (98%) rename qemu-option-internal.h => include/qemu/option_int.h (96%) rename osdep.h => include/qemu/osdep.h (100%) rename qemu-queue.h => include/qemu/queue.h (99%) rename range.h => include/qemu/range.h (100%) rename qemu_socket.h => include/qemu/sockets.h (96%) rename qemu-thread-posix.h => include/qemu/thread-posix.h (100%) rename qemu-thread-win32.h => include/qemu/thread-win32.h (100%) rename qemu-thread.h => include/qemu/thread.h (96%) rename qemu-timer.h => include/qemu/timer.h (99%) rename qemu-tls.h => include/qemu/tls.h (100%) rename qemu-types.h => include/qemu/typedefs.h (100%) rename uri.h => include/qemu/uri.h (100%) rename qemu-xattr.h => include/qemu/xattr.h (100%) rename include/{qemu => qom}/cpu.h (98%) rename include/{qemu => qom}/object.h (99%) rename include/{qemu => qom}/qom-qobject.h (97%) rename arch_init.h => include/sysemu/arch_init.h (100%) rename balloon.h => include/sysemu/balloon.h (95%) rename blockdev.h => include/sysemu/blockdev.h (96%) rename cpus.h => include/sysemu/cpus.h (100%) rename device_tree.h => include/sysemu/device_tree.h (100%) rename dma.h => include/sysemu/dma.h (99%) rename dump.h => include/sysemu/dump.h (100%) rename kvm.h => include/sysemu/kvm.h (99%) rename memory_mapping.h => include/sysemu/memory_mapping.h (98%) rename qemu-os-posix.h => include/sysemu/os-posix.h (100%) rename qemu-os-win32.h => include/sysemu/os-win32.h (100%) rename qtest.h => include/sysemu/qtest.h (100%) rename qemu-seccomp.h => include/sysemu/seccomp.h (95%) rename sysemu.h => include/sysemu/sysemu.h (97%) rename xen-mapcache.h => include/sysemu/xen-mapcache.h (100%) rename console.h => include/ui/console.h (99%) rename {hw => include/ui}/pixel_ops.h (100%) rename qemu-pixman.h => include/ui/qemu-pixman.h (100%) rename {ui => include/ui}/qemu-spice.h (95%) rename {ui => include/ui}/spice-display.h (98%) rename alpha.ld => ldscripts/alpha.ld (100%) rename arm.ld => ldscripts/arm.ld (100%) rename hppa.ld => ldscripts/hppa.ld (100%) rename i386.ld => ldscripts/i386.ld (100%) rename ia64.ld => ldscripts/ia64.ld (100%) rename m68k.ld => ldscripts/m68k.ld (100%) rename mips.ld => ldscripts/mips.ld (100%) rename ppc.ld => ldscripts/ppc.ld (100%) rename ppc64.ld => ldscripts/ppc64.ld (100%) rename s390.ld => ldscripts/s390.ld (100%) rename sparc.ld => ldscripts/sparc.ld (100%) rename sparc64.ld => ldscripts/sparc64.ld (100%) rename x86_64.ld => ldscripts/x86_64.ld (100%) rename net.c => net/net.c (99%) rename net/{tap.h => tap_int.h} (77%) delete mode 100644 qapi/qapi-types-core.h delete mode 100644 qapi/qapi-visit-impl.h rename qemu-ga.c => qga/main.c (99%) rename qapi-schema-guest.json => qga/qapi-schema.json (100%) rename console.c => ui/console.c (99%) rename cursor.c => ui/cursor.c (99%) rename cursor_hidden.xpm => ui/cursor_hidden.xpm (100%) rename cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm (100%) rename input.c => ui/input.c (99%) rename qemu-pixman.c => ui/qemu-pixman.c (98%) rename qemu-x509.h => ui/qemu-x509.h (100%) rename vgafont.h => ui/vgafont.h (100%) --- 1.8.0.2