From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0Yq-0001aZ-1y for qemu-devel@nongnu.org; Wed, 24 Oct 2012 08:59:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TR0Yh-0002sc-Cr for qemu-devel@nongnu.org; Wed, 24 Oct 2012 08:59:51 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:46181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0Yg-0002s4-R2 for qemu-devel@nongnu.org; Wed, 24 Oct 2012 08:59:43 -0400 Received: by mail-da0-f45.google.com with SMTP id n15so234236dad.4 for ; Wed, 24 Oct 2012 05:59:41 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 24 Oct 2012 14:58:30 +0200 Message-Id: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com So in the end I decided to hold off the renaming of the .c files. This is mostly because there are too many confusing rules for what files are included in which build product, and spreading this across multiple directories would make things worse. However, here is the header file renaming in all its beauty. One good thing about renaming headers is that it guides you in a) finding the best place for the corresponding source file in a multi-directory layout; b) finding blatant inclusions of the "wrong" file, with qemu-char.h being an especially good candidate for "I'll just include that one". Also, it is the only part that is really hard to rebase for me than for everyone else: it touches all source files (rather than just the Makefiles), and headers are touched (and conflict) much less than source files. Hence, this series only creates disas/ and qobject/, and moves some more files to existing directories such as ui/ or net/ or qga/. There are many, many cleanups to do on top of this before attempting to rename the .c files in a coherent structure and without any module violation. For example: - remove QEMU-specific stuff from qemu-config.c - deconstruct qemu-common.h and sysemu.h, to get more hints about where to put the various .c files. - replace stub files (qemu-tool.c, qemu-user.c, etc.) with weak functions - put all the utility functions together in a static library and just link with that one And all this is not even touching hw/. This series is organized as follows. Patches 1 to 8 are build system cleanups that also create the ldscripts/ and disas/ directories. Patches 9 to 15 are some more janitorial changes coming from the original series that moved files. They avoid massive indirect inclusion via qemu-char.h or net.h. >>From there on the patches were scripted. Patches 16, 17 and 21 also move .c files, the others only move headers. (This is not ready to be applied; I'll wait until Kevin and Luiz's next pull request, and then coordinate with Anthony to pull a rebased version). Paolo Bonzini (32): 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: move iovector functions out of cutils.c janitor: do not rely on indirect inclusions 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/ audio: move public header file to include/audio/ slirp: move public header file to include/slirp/ qapi: move include files to include/qapi/ qapi: create qobject/ and 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 + Makefile | 49 +-- Makefile.dis | 20 - Makefile.objs | 39 +-- Makefile.target | 8 +- Makefile.user | 24 -- a.out.h | 430 -------------------- acl.c | 2 +- aes.c | 2 +- aio.c | 6 +- arch_init.c | 22 +- async.c | 4 +- audio/Makefile.objs | 3 + audio/alsaaudio.c | 4 +- audio/audio.c | 8 +- audio/audio_pt_int.c | 2 +- audio/audio_win_int.c | 3 +- audio/coreaudio.c | 2 +- audio/dsoundaudio.c | 2 +- audio/esdaudio.c | 2 +- audio/fmodaudio.c | 2 +- audio/mixeng.c | 2 +- audio/noaudio.c | 4 +- audio/ossaudio.c | 6 +- audio/paaudio.c | 2 +- audio/sdlaudio.c | 2 +- audio/spiceaudio.c | 4 +- audio/wavaudio.c | 4 +- audio/wavcapture.c | 4 +- audio/winwaveaudio.c | 4 +- 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/nbd.c | 8 +- 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 | 9 +- block/raw-win32.c | 6 +- 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 +- blockdev-nbd.c | 12 +- blockdev.c | 20 +- blockjob.c | 14 +- bsd-user/elfload.c | 2 +- bsd-user/main.c | 4 +- bsd-user/qemu.h | 4 +- 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 | 109 +----- 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.c | 4 +- exec.c | 17 +- fpu/softfloat.c | 2 +- fsdev/qemu-fsdev-dummy.c | 2 +- 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 | 11 +- 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-xattr.h | 2 +- hw/9pfs/virtio-9p.c | 4 +- hw/9pfs/virtio-9p.h | 4 +- hw/Makefile.objs | 2 + hw/ac97.c | 2 +- hw/acpi.c | 4 +- hw/acpi.h | 2 +- hw/acpi_piix4.c | 6 +- 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 | 1 - hw/alpha_typhoon.c | 6 +- hw/an5206.c | 2 +- hw/apb_pci.c | 4 +- hw/apic.c | 4 +- hw/apic_common.c | 2 +- hw/apic_internal.h | 4 +- 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/axis_dev88.c | 6 +- hw/baum.c | 4 +- hw/blizzard.c | 2 +- hw/block-common.c | 4 +- hw/bonito.c | 4 +- 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/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 | 2 +- hw/collie.c | 4 +- hw/cs4231a.c | 2 +- hw/cuda.c | 4 +- hw/debugcon.c | 2 +- hw/device-hotplug.c | 9 +- hw/dma.c | 1 + hw/dp8393x.c | 4 +- hw/dummy_m68k.c | 2 +- hw/e1000.c | 6 +- hw/eepro100.c | 6 +- hw/es1370.c | 2 +- hw/escc.c | 4 +- hw/esp-pci.c | 2 +- hw/esp.c | 2 +- hw/etraxfs.h | 2 +- hw/etraxfs_dma.c | 4 +- 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 | 6 +- 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 | 2 +- hw/framebuffer.c | 2 +- hw/framebuffer.h | 2 +- hw/fw_cfg.c | 5 +- hw/g364fb.c | 2 +- hw/grlib_apbuart.c | 2 +- hw/grlib_gptimer.c | 2 +- hw/gt64xxx.c | 2 +- hw/gumstix.c | 6 +- hw/hd-geometry.c | 2 +- hw/hid.c | 4 +- hw/hid.h | 2 +- hw/highbank.c | 8 +- hw/hpet.c | 4 +- hw/hw.h | 10 +- hw/i8254.c | 2 +- hw/i8254_common.c | 2 +- hw/i8259.c | 4 +- hw/ide.h | 2 +- hw/ide/ahci.c | 6 +- hw/ide/cmd646.c | 6 +- hw/ide/core.c | 10 +- hw/ide/ich.c | 4 +- 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 | 4 +- hw/ide/piix.c | 6 +- hw/ide/qdev.c | 8 +- hw/ide/via.c | 6 +- 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 | 4 +- hw/ioapic_internal.h | 2 +- hw/isa-bus.c | 6 +- hw/isa.h | 4 +- hw/isa_mmio.c | 2 +- hw/ivshmem.c | 9 +- hw/jazz_led.c | 2 +- hw/kvm/apic.c | 2 +- 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 | 10 +- hw/kvmvapic.c | 6 +- hw/kzm.c | 6 +- hw/lan9118.c | 4 +- hw/lance.c | 6 +- hw/leon3.c | 8 +- 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/lsi53c895a.c | 2 +- hw/m25p80.c | 2 +- hw/m48t59.c | 4 +- hw/mac_dbdma.c | 1 + hw/mac_dbdma.h | 2 +- hw/mac_nvram.c | 2 +- hw/mainstone.c | 6 +- hw/mc146818rtc.c | 4 +- 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 | 6 +- 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 | 4 +- hw/milkymist.c | 7 +- hw/mips.h | 2 +- hw/mips_fulong2e.c | 14 +- hw/mips_jazz.c | 10 +- hw/mips_malta.c | 16 +- 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/msi.c | 2 +- hw/msix.c | 2 +- hw/msmouse.c | 6 +- hw/multiboot.c | 2 +- hw/musicpal.c | 14 +- hw/nand.c | 4 +- hw/ne2000-isa.c | 4 +- hw/ne2000.c | 4 +- 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 | 2 +- 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/openrisc_sim.c | 8 +- hw/openrisc_timer.c | 2 +- hw/palm.c | 6 +- hw/parallel.c | 4 +- hw/pc.c | 16 +- hw/pc.h | 8 +- hw/pc_piix.c | 14 +- hw/pc_sysfw.c | 6 +- hw/pci-hotplug.c | 10 +- hw/pci-stub.c | 4 +- hw/pci.c | 10 +- hw/pci.h | 4 +- hw/pci_bridge.c | 2 +- hw/pci_bridge_dev.c | 2 +- hw/pcie.c | 2 +- hw/pcie_aer.c | 6 +- hw/pcie_host.c | 2 +- hw/pcie_host.h | 2 +- hw/pckbd.c | 2 +- hw/pcnet-pci.c | 6 +- hw/pcnet.c | 8 +- hw/pcnet.h | 2 +- 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/piix_pci.c | 2 +- hw/pl011.c | 2 +- hw/pl031.c | 4 +- hw/pl110.c | 2 +- hw/pl181.c | 2 +- hw/ppc.c | 8 +- hw/ppc/e500.c | 10 +- hw/ppc/e500plat.c | 2 +- hw/ppc/mpc8544ds.c | 2 +- hw/ppc405_boards.c | 10 +- hw/ppc405_uc.c | 8 +- hw/ppc440_bamboo.c | 10 +- hw/ppc4xx_devs.c | 4 +- hw/ppc4xx_pci.c | 2 +- hw/ppc_booke.c | 6 +- hw/ppc_mac.h | 2 +- hw/ppc_newworld.c | 10 +- hw/ppc_oldworld.c | 10 +- hw/ppc_prep.c | 12 +- hw/ppce500_pci.c | 4 +- hw/ppce500_spin.c | 4 +- hw/prep_pci.c | 2 +- hw/ps2.c | 4 +- hw/ptimer.c | 4 +- hw/ptimer.h | 4 +- hw/puv3.c | 4 +- hw/pxa.h | 2 +- hw/pxa2xx.c | 6 +- hw/pxa2xx_keypad.c | 2 +- hw/pxa2xx_lcd.c | 4 +- hw/pxa2xx_timer.c | 4 +- hw/qdev-addr.c | 2 +- hw/qdev-monitor.c | 5 +- hw/qdev-properties.c | 8 +- hw/qdev.c | 6 +- hw/qdev.h | 11 +- hw/qxl-logger.c | 2 +- hw/qxl.c | 8 +- hw/qxl.h | 4 +- hw/r2d.c | 8 +- hw/rc4030.c | 2 +- hw/realview.c | 8 +- hw/rtl8139.c | 10 +- hw/s390-virtio-bus.c | 9 +- hw/s390-virtio.c | 14 +- hw/sb16.c | 4 +- hw/scsi-bus.c | 6 +- hw/scsi-disk.c | 8 +- hw/scsi-generic.c | 4 +- hw/scsi.h | 4 +- hw/sd.c | 4 +- hw/serial.c | 4 +- hw/serial.h | 4 +- hw/sga.c | 2 +- hw/sh7750.c | 4 +- hw/sh_intc.h | 2 +- hw/sh_pci.c | 4 +- hw/sh_serial.c | 4 +- hw/sh_timer.c | 4 +- hw/shix.c | 4 +- hw/shpc.c | 4 +- hw/shpc.h | 4 +- hw/slavio_intctl.c | 2 +- hw/slavio_misc.c | 2 +- hw/slavio_timer.c | 2 +- hw/sm501.c | 4 +- hw/smbios.c | 2 +- hw/smc91c111.c | 2 +- hw/soc_dma.c | 2 +- hw/soc_dma.h | 2 +- hw/spapr.c | 14 +- hw/spapr.h | 2 +- hw/spapr_hcall.c | 6 +- hw/spapr_iommu.c | 6 +- hw/spapr_llan.c | 2 +- hw/spapr_pci.c | 2 +- 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 | 10 +- hw/sysbus.c | 4 +- hw/sysbus.h | 2 +- hw/tc6393xb.c | 4 +- hw/tcx.c | 2 +- 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/usb.h | 2 +- hw/usb/bus.c | 4 +- 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.c | 8 +- hw/usb/hcd-musb.c | 2 +- hw/usb/hcd-ohci.c | 2 +- hw/usb/hcd-uhci.c | 6 +- hw/usb/hcd-xhci.c | 2 +- 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 | 6 +- hw/versatile_pci.c | 2 +- hw/versatilepb.c | 8 +- hw/vexpress.c | 8 +- hw/vfio_pci.c | 14 +- hw/vga-isa-mm.c | 4 +- hw/vga-isa.c | 4 +- hw/vga-pci.c | 4 +- hw/vga.c | 4 +- hw/vga_int.h | 4 +- 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-blk.c | 4 +- hw/virtio-console.c | 4 +- hw/virtio-net.c | 8 +- hw/virtio-net.h | 28 -- hw/virtio-pci.c | 9 +- hw/virtio-scsi.h | 1 - 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 | 2 +- hw/vt82c686.c | 4 +- hw/watchdog.c | 12 +- hw/watchdog.h | 2 +- hw/wdt_i6300esb.c | 2 +- hw/wdt_ib700.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 | 3 +- hw/xen_pt.c | 4 +- hw/xen_pt_config_init.c | 2 +- hw/xenfb.c | 4 +- hw/xgmac.c | 6 +- hw/xilinx.h | 2 +- hw/xilinx_axidma.c | 5 +- hw/xilinx_axienet.c | 5 +- hw/xilinx_ethlite.c | 2 +- hw/xilinx_spi.c | 4 +- hw/xilinx_spips.c | 4 +- hw/xilinx_timer.c | 2 +- hw/xilinx_uartlite.c | 2 +- hw/xilinx_zynq.c | 8 +- hw/xtensa_lx60.c | 11 +- hw/xtensa_pic.c | 4 +- hw/xtensa_sim.c | 6 +- hw/z2.c | 8 +- hw/zynq_slcr.c | 4 +- {audio => include/audio}/audio.h | 2 +- aes.h => include/block/aes.h | 0 qemu-aio.h => include/block/aio.h | 2 +- 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 include/bt/bt.h | 20 + qemu-char.h => include/char/char.h | 12 +- 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 cpu-all.h => include/exec/cpu-all.h | 4 +- cpu-common.h => include/exec/cpu-common.h | 8 +- cpu-defs.h => include/exec/cpu-defs.h | 6 +- def-helper.h => include/exec/def-helper.h | 0 exec-all.h => include/exec/exec-all.h | 14 +- exec-memory.h => include/exec/exec-memory.h | 2 +- gdbstub.h => include/exec/gdbstub.h | 0 gen-icount.h => include/exec/gen-icount.h | 2 +- poison.h => include/exec/poison.h | 0 softmmu-semi.h => include/exec/softmmu-semi.h | 0 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 targphys.h => include/exec/targphys.h | 0 {fpu => include/fpu}/softfloat.h | 2 +- libfdt_env.h => include/libfdt_env.h | 2 +- block-migration.h => include/migration/block.h | 0 qemu-file.h => include/migration/file.h | 0 migration.h => include/migration/migration.h | 8 +- include/{qemu => migration}/page_cache.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 +- {net => include/net}/tap.h | 37 +- .../qapi/dealloc-visitor.h | 2 +- error.h => include/qapi/error.h | 2 +- {qapi => include/qapi}/opts-visitor.h | 4 +- {qapi => include/qapi}/qmp-core.h | 6 +- {qapi => include/qapi}/qmp-input-visitor.h | 4 +- {qapi => include/qapi}/qmp-output-visitor.h | 4 +- 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 +- .../qapi-types-core.h => include/qapi/types-core.h | 4 +- .../qapi-visit-core.h => include/qapi/visit-core.h | 2 +- .../qapi-visit-impl.h => include/qapi/visit-impl.h | 4 +- qemu-common.h => include/qemu-common.h | 12 +- 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 | 3 +- envlist.h => include/qemu/envlist.h | 0 qemu-error.h => include/qemu/error.h | 0 event_notifier.h => include/qemu/event_notifier.h | 0 host-utils.h => include/qemu/host-utils.h | 2 +- int128.h => include/qemu/int128.h | 0 iov.h => include/qemu/iov.h | 0 qemu-log.h => include/qemu/log.h | 2 +- main-loop.h => include/qemu/main-loop.h | 0 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 | 2 +- osdep.h => include/qemu/osdep.h | 0 qemu-queue.h => include/qemu/queue.h | 2 +- range.h => include/qemu/range.h | 0 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 uri.h => include/qemu/uri.h | 0 qemu-xattr.h => include/qemu/xattr.h | 0 json-lexer.h => include/qobject/json-lexer.h | 4 +- json-parser.h => include/qobject/json-parser.h | 4 +- json-streamer.h => include/qobject/json-streamer.h | 4 +- qbool.h => include/qobject/qbool.h | 2 +- qdict.h => include/qobject/qdict.h | 6 +- qerror.h => include/qobject/qerror.h | 8 +- qfloat.h => include/qobject/qfloat.h | 2 +- qint.h => include/qobject/qint.h | 2 +- qjson.h => include/qobject/qjson.h | 6 +- qlist.h => include/qobject/qlist.h | 6 +- qobject.h => include/qobject/qobject.h | 0 qstring.h => include/qobject/qstring.h | 2 +- include/{qemu => qom}/cpu.h | 4 +- include/{qemu => qom}/object.h | 2 +- include/{qemu => qom}/qom-qobject.h | 2 +- {slirp => include/slirp}/libslirp.h | 5 + 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 cputlb.h => include/sysemu/cputlb.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 ioport.h => include/sysemu/ioport.h | 2 +- iorange.h => include/sysemu/iorange.h | 0 kvm.h => include/sysemu/kvm.h | 2 +- .../sysemu/memory-internal.h | 0 memory.h => include/sysemu/memory.h | 12 +- .../sysemu/memory_mapping.h | 2 +- qemu-os-posix.h => include/sysemu/os-posix.h | 0 qemu-os-win32.h => include/sysemu/os-win32.h | 2 +- qtest.h => include/sysemu/qtest.h | 0 qemu-seccomp.h => include/sysemu/seccomp.h | 2 +- sysemu.h => include/sysemu/sysemu.h | 10 +- xen-mapcache.h => include/sysemu/xen-mapcache.h | 0 console.h => include/ui/console.h | 9 +- pflib.h => include/ui/pflib.h | 0 {ui => include/ui}/qemu-spice.h | 9 +- {ui => include/ui}/spice-display.h | 6 +- iohandler.c | 5 +- ioport.c | 4 +- iov.c | 105 +++++- kvm-all.c | 20 +- kvm-stub.c | 4 +- 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-aio.c | 3 +- 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/elfload.c | 2 +- linux-user/main.c | 6 +- linux-user/qemu.h | 6 +- linux-user/syscall.c | 2 +- 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 | 50 ++-- 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 | 7 +- 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 +- posix-aio-compat.c | 10 +- qapi/opts-visitor.c | 8 +- qapi/qapi-dealloc-visitor.c | 6 +- qapi/qapi-visit-core.c | 4 +- qapi/qmp-dispatch.c | 8 +- qapi/qmp-input-visitor.c | 10 +- qapi/qmp-output-visitor.c | 10 +- qapi/string-input-visitor.c | 6 +- qapi/string-output-visitor.c | 6 +- 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 +- qga/Makefile.objs | 2 +- qga/channel-posix.c | 2 +- qga/commands-posix.c | 6 +- qga/commands-win32.c | 2 +- qga/commands.c | 2 +- qemu-ga.c => qga/main.c | 12 +- qapi-schema-guest.json => qga/qapi-schema.json | 0 qmp.c | 11 +- qobject/Makefile.objs | 4 + json-lexer.c => qobject/json-lexer.c | 10 +- json-parser.c => qobject/json-parser.c | 18 +- json-streamer.c => qobject/json-streamer.c | 10 +- qbool.c => qobject/qbool.c | 4 +- qdict.c => qobject/qdict.c | 14 +- qerror.c => qobject/qerror.c | 6 +- qfloat.c => qobject/qfloat.c | 4 +- qint.c => qobject/qint.c | 4 +- qjson.c => qobject/qjson.c | 18 +- qlist.c => qobject/qlist.c | 6 +- qstring.c => qobject/qstring.c | 4 +- qom/container.c | 4 +- qom/cpu.c | 2 +- qom/object.c | 14 +- qom/qom-qobject.c | 6 +- qtest.c | 12 +- readline.c | 4 +- rules.mak | 5 +- savevm.c | 21 +- scripts/feature_to_c.sh | 2 +- scripts/qapi-commands.py | 10 +- scripts/qapi-types.py | 2 +- scripts/qapi-visit.py | 2 +- slirp/if.c | 2 +- slirp/ip_input.c | 2 +- slirp/misc.c | 5 +- slirp/sbuf.c | 2 +- slirp/slirp.c | 4 +- slirp/slirp.h | 11 +- spice-qemu-char.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/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 | 10 +- 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 | 11 +- 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/hppa/tcg-target.c | 2 +- tcg/i386/tcg-target.c | 2 +- tcg/ia64/tcg-target.c | 2 +- tcg/mips/tcg-target.c | 2 +- tcg/ppc/tcg-target.c | 2 +- tcg/ppc64/tcg-target.c | 2 +- tcg/s390/tcg-target.c | 2 +- tcg/sparc/tcg-target.c | 2 +- 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/test-i386.c | 2 +- tests/test-coroutine.c | 2 +- tests/test-iov.c | 4 +- tests/test-qmp-commands.c | 4 +- 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-visitor-serialization.c | 2 +- trace/simple.c | 2 +- translate-all.c | 4 +- ui/Makefile.objs | 7 +- ui/cocoa.m | 4 +- console.c => ui/console.c | 5 +- ui/curses.c | 4 +- cursor.c => ui/cursor.c | 2 +- cursor_hidden.xpm => ui/cursor_hidden.xpm | 0 cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm | 0 input.c => ui/input.c | 9 +- ui/keymaps.c | 2 +- pflib.c => ui/pflib.c | 4 +- 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 | 6 +- xen-mapcache.c | 6 +- xen-stub.c | 2 +- 1006 files changed, 2511 insertions(+), 3070 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%) rename uboot_image.h => hw/uboot_image.h (100%) rename {audio => include/audio}/audio.h (99%) rename aes.h => include/block/aes.h (100%) rename qemu-aio.h => include/block/aio.h (98%) 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%) 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 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 def-helper.h => include/exec/def-helper.h (100%) rename exec-all.h => include/exec/exec-all.h (98%) rename exec-memory.h => include/exec/exec-memory.h (97%) rename gdbstub.h => include/exec/gdbstub.h (100%) rename gen-icount.h => include/exec/gen-icount.h (98%) rename poison.h => include/exec/poison.h (100%) rename softmmu-semi.h => include/exec/softmmu-semi.h (100%) 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 targphys.h => include/exec/targphys.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 qemu-file.h => include/migration/file.h (100%) rename migration.h => include/migration/migration.h (97%) rename include/{qemu => migration}/page_cache.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%) copy {net => include/net}/tap.h (69%) 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-core.h (93%) rename {qapi => include/qapi}/qmp-input-visitor.h (91%) rename {qapi => include/qapi}/qmp-output-visitor.h (91%) rename qemu-objects.h => include/qapi/qmp-types.h (61%) rename {qapi => include/qapi}/string-input-visitor.h (95%) rename {qapi => include/qapi}/string-output-visitor.h (95%) rename qapi/qapi-types-core.h => include/qapi/types-core.h (87%) rename qapi/qapi-visit-core.h => include/qapi/visit-core.h (99%) rename qapi/qapi-visit-impl.h => include/qapi/visit-impl.h (90%) 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 (93%) rename envlist.h => include/qemu/envlist.h (100%) rename qemu-error.h => include/qemu/error.h (100%) rename event_notifier.h => include/qemu/event_notifier.h (100%) rename host-utils.h => include/qemu/host-utils.h (99%) rename int128.h => include/qemu/int128.h (100%) rename iov.h => include/qemu/iov.h (100%) rename qemu-log.h => include/qemu/log.h (99%) rename main-loop.h => include/qemu/main-loop.h (100%) 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 (98%) 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 (95%) rename qemu-timer.h => include/qemu/timer.h (99%) rename qemu-tls.h => include/qemu/tls.h (100%) rename uri.h => include/qemu/uri.h (100%) rename qemu-xattr.h => include/qemu/xattr.h (100%) rename json-lexer.h => include/qobject/json-lexer.h (94%) rename json-parser.h => include/qobject/json-parser.h (90%) rename json-streamer.h => include/qobject/json-streamer.h (94%) rename qbool.h => include/qobject/qbool.h (94%) rename qdict.h => include/qobject/qdict.h (96%) rename qerror.h => include/qobject/qerror.h (98%) rename qfloat.h => include/qobject/qfloat.h (94%) rename qint.h => include/qobject/qint.h (94%) rename qjson.h => include/qobject/qjson.h (88%) rename qlist.h => include/qobject/qlist.h (95%) rename qobject.h => include/qobject/qobject.h (100%) rename qstring.h => include/qobject/qstring.h (96%) rename include/{qemu => qom}/cpu.h (97%) rename include/{qemu => qom}/object.h (99%) rename include/{qemu => qom}/qom-qobject.h (97%) rename {slirp => include/slirp}/libslirp.h (96%) 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 cputlb.h => include/sysemu/cputlb.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 ioport.h => include/sysemu/ioport.h (98%) rename iorange.h => include/sysemu/iorange.h (100%) rename kvm.h => include/sysemu/kvm.h (99%) rename memory-internal.h => include/sysemu/memory-internal.h (100%) rename memory.h => include/sysemu/memory.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 (99%) 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 pflib.h => include/ui/pflib.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%) rename qemu-ga.c => qga/main.c (99%) rename qapi-schema-guest.json => qga/qapi-schema.json (100%) create mode 100644 qobject/Makefile.objs rename json-lexer.c => qobject/json-lexer.c (98%) rename json-parser.c => qobject/json-parser.c (98%) rename json-streamer.c => qobject/json-streamer.c (95%) rename qbool.c => qobject/qbool.c (95%) rename qdict.c => qobject/qdict.c (98%) rename qerror.c => qobject/qerror.c (97%) rename qfloat.c => qobject/qfloat.c (95%) rename qint.c => qobject/qint.c (95%) rename qjson.c => qobject/qjson.c (96%) rename qlist.c => qobject/qlist.c (97%) rename qstring.c => qobject/qstring.c (98%) 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 pflib.c => ui/pflib.c (99%) rename qemu-x509.h => ui/qemu-x509.h (100%) rename vgafont.h => ui/vgafont.h (100%)