[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [qemu-upstream-unstable] Merge remote-tracking branch 'xen-staging/master' into xen-for-4.5-temp
=== This changeset includes merge from high-traffic branch === Commits on that branch are not reported individually. commit 2addb502cdb50bab00514b9723bf6e09c88ff75e Merge: 1e1a3289f473a460bee7a8745574f61c9e2f8506 65fc9b78ba3d868a26952db0d8e51cecf01d47b4 Author: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx> AuthorDate: Tue Jun 3 17:52:59 2014 +0000 Commit: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx> CommitDate: Tue Jun 3 17:52:59 2014 +0000 Merge remote-tracking branch 'xen-staging/master' into xen-for-4.5-temp .gitignore | 153 +- .gitmodules | 17 +- .mailmap | 3 +- .travis.yml | 81 + CODING_STYLE | 7 + Changelog | 2 +- MAINTAINERS | 182 +- Makefile | 70 +- Makefile.objs | 28 +- Makefile.target | 37 +- QMP/README | 88 - QMP/qemu-ga-client | 299 - QMP/qmp | 126 - QMP/qmp-events.txt | 480 - QMP/qmp-shell | 286 - QMP/qmp-spec.txt | 282 - QMP/qmp.py | 190 - QMP/qom-fuse | 138 - QMP/qom-get | 67 - QMP/qom-list | 64 - QMP/qom-set | 64 - README | 2 +- VERSION | 2 +- aio-posix.c | 55 +- aio-win32.c | 58 +- arch_init.c | 285 +- async.c | 42 +- audio/audio.c | 10 +- audio/mixeng.c | 6 - audio/mixeng_template.h | 4 +- audio/noaudio.c | 4 +- audio/ossaudio.c | 4 + audio/paaudio.c | 8 +- audio/spiceaudio.c | 31 +- audio/wavaudio.c | 2 +- backends/baum.c | 24 +- backends/rng-egd.c | 1 - backends/rng-random.c | 4 +- backends/rng.c | 17 +- block-migration.c | 29 +- block.c | 2550 +- block/Makefile.objs | 21 +- block/backup.c | 28 +- block/blkdebug.c | 133 +- block/blkverify.c | 168 +- block/bochs.c | 125 +- block/cloop.c | 84 +- block/commit.c | 22 +- block/cow.c | 185 +- block/curl.c | 137 +- block/dmg.c | 278 +- block/gluster.c | 543 +- block/iscsi.c | 1117 +- block/linux-aio.c | 18 +- block/mirror.c | 212 +- block/nbd-client.c | 388 + block/nbd-client.h | 50 + block/nbd.c | 431 +- block/nfs.c | 442 + block/parallels.c | 20 +- block/qapi.c | 225 +- block/qcow.c | 41 +- block/qcow2-cache.c | 33 + block/qcow2-cluster.c | 377 +- block/qcow2-refcount.c | 716 +- block/qcow2-snapshot.c | 160 +- block/qcow2.c | 873 +- block/qcow2.h | 156 +- block/qed.c | 122 +- block/qed.h | 2 +- block/quorum.c | 877 + block/raw-aio.h | 3 +- block/raw-posix.c | 472 +- block/raw-win32.c | 106 +- block/raw.c | 192 - block/raw_bsd.c | 206 + block/rbd.c | 174 +- block/sheepdog.c | 586 +- block/snapshot.c | 210 +- block/ssh.c | 18 +- block/stream.c | 36 +- block/vdi.c | 90 +- block/vhdx-endian.c | 216 + block/vhdx-log.c | 1021 + block/vhdx.c | 1287 +- block/vhdx.h | 181 +- block/vmdk.c | 651 +- block/vpc.c | 100 +- block/vvfat.c | 96 +- block/win32-aio.c | 10 +- blockdev-nbd.c | 10 +- blockdev.c | 1492 +- blockjob.c | 31 +- bsd-user/main.c | 2 +- bsd-user/qemu.h | 6 +- configure | 1307 +- cpu-exec.c | 179 +- cpus.c | 430 +- cputlb.c | 76 +- default-configs/aarch64-linux-user.mak | 3 + default-configs/aarch64-softmmu.mak | 6 + default-configs/arm-linux-user.mak | 2 - default-configs/arm-softmmu.mak | 14 +- default-configs/armeb-linux-user.mak | 2 - default-configs/m68k-linux-user.mak | 2 - default-configs/m68k-softmmu.mak | 1 - default-configs/ppc-linux-user.mak | 2 - default-configs/ppc-softmmu.mak | 4 +- default-configs/ppc64-linux-user.mak | 2 - default-configs/ppc64-softmmu.mak | 4 +- default-configs/ppc64abi32-linux-user.mak | 2 - default-configs/ppcemb-softmmu.mak | 26 - default-configs/s390x-softmmu.mak | 1 + default-configs/sparc-softmmu.mak | 1 + device-hotplug.c | 4 +- device_tree.c | 68 +- disas.c | 61 +- disas/Makefile.objs | 5 + disas/arm-a64.cc | 87 + disas/i386.c | 154 +- disas/libvixl/LICENCE | 30 + disas/libvixl/Makefile.objs | 8 + disas/libvixl/README | 12 + disas/libvixl/a64/assembler-a64.h | 1784 + disas/libvixl/a64/constants-a64.h | 1104 + disas/libvixl/a64/cpu-a64.h | 56 + disas/libvixl/a64/decoder-a64.cc | 712 + disas/libvixl/a64/decoder-a64.h | 198 + disas/libvixl/a64/disasm-a64.cc | 1678 + disas/libvixl/a64/disasm-a64.h | 109 + disas/libvixl/a64/instructions-a64.cc | 238 + disas/libvixl/a64/instructions-a64.h | 344 + disas/libvixl/globals.h | 65 + disas/libvixl/platform.h | 43 + disas/libvixl/utils.cc | 126 + disas/libvixl/utils.h | 126 + disas/ppc.c | 3 +- dma-helpers.c | 2 + docs/ccid.txt | 2 +- docs/memory.txt | 68 +- docs/q35-chipset.cfg | 23 + docs/qapi-code-gen.txt | 24 +- docs/qemupciserial.inf | 167 +- docs/qmp/README | 87 + docs/qmp/qmp-events.txt | 541 + docs/qmp/qmp-spec.txt | 273 + docs/rdma.txt | 26 +- docs/specs/acpi_cpu_hotplug.txt | 4 +- docs/specs/qcow2.txt | 10 +- docs/tracing.txt | 36 + dump.c | 974 +- exec.c | 1081 +- fpu/softfloat.c | 1155 +- fsdev/Makefile.objs | 4 +- fsdev/virtfs-proxy-helper.c | 2 +- gdb-xml/aarch64-core.xml | 46 + gdb-xml/aarch64-fpu.xml | 86 + gdbstub.c | 71 +- hmp-commands.hx | 93 +- hmp.c | 175 +- hmp.h | 5 + hw/9pfs/cofile.c | 4 - hw/9pfs/cofs.c | 48 +- hw/9pfs/virtio-9p-device.c | 43 +- hw/9pfs/virtio-9p-handle.c | 17 +- hw/9pfs/virtio-9p-local.c | 298 +- hw/9pfs/virtio-9p-posix-acl.c | 52 +- hw/9pfs/virtio-9p-proxy.c | 3 +- hw/9pfs/virtio-9p-xattr-user.c | 27 +- hw/9pfs/virtio-9p-xattr.c | 15 +- hw/9pfs/virtio-9p-xattr.h | 27 +- hw/9pfs/virtio-9p.c | 12 +- hw/9pfs/virtio-9p.h | 6 +- hw/Makefile.objs | 4 +- hw/acpi/Makefile.objs | 3 +- hw/acpi/core.c | 69 +- hw/acpi/cpu_hotplug.c | 65 + hw/acpi/ich9.c | 62 +- hw/acpi/pcihp.c | 331 + hw/acpi/piix4.c | 478 +- hw/alpha/dp264.c | 6 +- hw/alpha/typhoon.c | 206 +- hw/arm/Makefile.objs | 7 +- hw/arm/allwinner-a10.c | 119 + hw/arm/armv7m.c | 30 +- hw/arm/boot.c | 274 +- hw/arm/collie.c | 1 - hw/arm/cubieboard.c | 76 + hw/arm/digic.c | 115 + hw/arm/digic_boards.c | 162 + hw/arm/exynos4210.c | 34 +- hw/arm/exynos4_boards.c | 5 +- hw/arm/gumstix.c | 13 +- hw/arm/highbank.c | 55 +- hw/arm/integratorcp.c | 24 +- hw/arm/kzm.c | 9 +- hw/arm/mainstone.c | 21 +- hw/arm/musicpal.c | 21 +- hw/arm/nseries.c | 8 +- hw/arm/omap1.c | 84 +- hw/arm/omap2.c | 8 +- hw/arm/omap_sx1.c | 15 +- hw/arm/palm.c | 14 +- hw/arm/pic_cpu.c | 68 - hw/arm/pxa2xx.c | 151 +- hw/arm/pxa2xx_gpio.c | 2 +- hw/arm/pxa2xx_pic.c | 15 +- hw/arm/realview.c | 49 +- hw/arm/spitz.c | 25 +- hw/arm/stellaris.c | 20 +- hw/arm/strongarm.c | 40 +- hw/arm/tosa.c | 19 +- hw/arm/versatilepb.c | 14 +- hw/arm/vexpress.c | 190 +- hw/arm/virt.c | 458 + hw/arm/xilinx_zynq.c | 53 +- hw/arm/z2.c | 42 +- hw/audio/ac97.c | 4 +- hw/audio/adlib.c | 8 +- hw/audio/cs4231a.c | 2 +- hw/audio/es1370.c | 4 +- hw/audio/fmopl.c | 6 +- hw/audio/gus.c | 2 +- hw/audio/hda-codec-common.h | 456 + hw/audio/hda-codec.c | 520 +- hw/audio/intel-hda.c | 17 +- hw/audio/intel-hda.h | 2 +- hw/audio/marvell_88w8618.c | 2 + hw/audio/pcspk.c | 5 +- hw/audio/pl041.c | 1 - hw/audio/sb16.c | 10 +- hw/audio/wm8750.c | 33 +- hw/block/cdrom.c | 10 +- hw/block/dataplane/virtio-blk.c | 231 +- hw/block/dataplane/virtio-blk.h | 5 +- hw/block/fdc.c | 9 +- hw/block/m25p80.c | 14 +- hw/block/nand.c | 2 +- hw/block/nvme.c | 26 +- hw/block/pflash_cfi01.c | 262 +- hw/block/pflash_cfi02.c | 12 +- hw/block/tc58128.c | 10 +- hw/block/virtio-blk.c | 50 +- hw/block/xen_blkif.h | 12 + hw/block/xen_disk.c | 73 +- hw/bt/core.c | 23 + hw/bt/hci-csr.c | 4 +- hw/bt/hci.c | 86 +- hw/bt/l2cap.c | 8 +- hw/char/Makefile.objs | 5 +- hw/char/cadence_uart.c | 161 +- hw/char/debugcon.c | 4 +- hw/char/digic-uart.c | 195 + hw/char/exynos4210_uart.c | 6 +- hw/char/ipack.c | 116 - hw/char/ipack.h | 79 - hw/char/ipoctal232.c | 20 +- hw/char/lm32_juart.c | 2 +- hw/char/lm32_uart.c | 2 +- hw/char/milkymist-uart.c | 26 +- hw/char/parallel.c | 2 +- hw/char/pl011.c | 24 +- hw/char/sclpconsole-lm.c | 379 + hw/char/sclpconsole.c | 114 +- hw/char/serial-isa.c | 2 +- hw/char/serial-pci.c | 5 +- hw/char/serial.c | 33 +- hw/char/sh_serial.c | 2 - hw/char/spapr_vty.c | 1 + hw/char/tpci200.c | 672 - hw/char/virtio-console.c | 69 +- hw/char/virtio-serial-bus.c | 96 +- hw/core/Makefile.objs | 4 +- hw/core/fw-path-provider.c | 52 + hw/core/hotplug.c | 48 + hw/core/irq.c | 16 + hw/core/loader.c | 126 +- hw/core/machine.c | 28 + hw/core/null-machine.c | 1 - hw/core/ptimer.c | 18 +- hw/core/qdev-properties-system.c | 99 +- hw/core/qdev-properties.c | 254 +- hw/core/qdev.c | 300 +- hw/core/sysbus.c | 15 +- hw/cpu/Makefile.objs | 5 +- hw/cpu/a15mpcore.c | 92 +- hw/cpu/a9mpcore.c | 148 +- hw/cpu/arm11mpcore.c | 251 +- hw/cpu/icc_bus.c | 17 +- hw/cpu/realview_mpcore.c | 139 + hw/cris/Makefile.objs | 1 - hw/cris/axis_dev88.c | 19 +- hw/cris/pic_cpu.c | 47 - hw/display/Makefile.objs | 4 +- hw/display/ads7846.c | 7 +- hw/display/blizzard.c | 2 +- hw/display/blizzard_template.h | 40 +- hw/display/cg3.c | 385 + hw/display/cirrus_vga.c | 9 +- hw/display/exynos4210_fimd.c | 2 +- hw/display/g364fb.c | 4 +- hw/display/jazz_led.c | 2 +- hw/display/milkymist-vgafb.c | 2 +- hw/display/milkymist-vgafb_template.h | 2 +- hw/display/omap_lcdc.c | 2 +- hw/display/pl110.c | 21 +- hw/display/pl110_template.h | 12 +- hw/display/pxa2xx_lcd.c | 2 +- hw/display/pxa2xx_template.h | 22 +- hw/display/qxl-logger.c | 2 +- hw/display/qxl-render.c | 1 + hw/display/qxl.c | 114 +- hw/display/qxl.h | 6 +- hw/display/sm501.c | 3 +- hw/display/sm501_template.h | 2 +- hw/display/ssd0303.c | 20 +- hw/display/ssd0323.c | 11 +- hw/display/tc6393xb.c | 2 +- hw/display/tc6393xb_template.h | 14 +- hw/display/tcx.c | 32 +- hw/display/vga-isa-mm.c | 2 +- hw/display/vga-isa.c | 2 +- hw/display/vga-pci.c | 4 +- hw/display/vga.c | 12 +- hw/display/vga_template.h | 14 +- hw/display/vmware_vga.c | 8 +- hw/display/xenfb.c | 9 +- hw/dma/i82374.c | 2 +- hw/dma/pl080.c | 10 +- hw/dma/pl330.c | 61 +- hw/dma/rc4030.c | 4 +- hw/dma/soc_dma.c | 8 +- hw/dma/sparc32_dma.c | 2 + hw/dma/sun4m_iommu.c | 5 +- hw/dma/xilinx_axidma.c | 38 +- hw/gpio/max7310.c | 23 +- hw/gpio/omap_gpio.c | 4 + hw/i2c/bitbang_i2c.c | 6 +- hw/i2c/bitbang_i2c.h | 2 +- hw/i2c/core.c | 32 +- hw/i2c/exynos4210_i2c.c | 2 +- hw/i2c/omap_i2c.c | 6 +- hw/i2c/pm_smbus.c | 2 +- hw/i2c/smbus.c | 18 +- hw/i2c/smbus_eeprom.c | 4 +- hw/i2c/smbus_ich9.c | 8 +- hw/i2c/versatile_i2c.c | 2 +- hw/i386/Makefile.objs | 29 +- hw/i386/acpi-build.c | 1558 + hw/i386/acpi-build.h | 9 + hw/i386/acpi-defs.h | 317 + hw/i386/acpi-dsdt-cpu-hotplug.dsl | 104 + hw/i386/acpi-dsdt-dbug.dsl | 41 + hw/i386/acpi-dsdt-hpet.dsl | 48 + hw/i386/acpi-dsdt-isa.dsl | 128 + hw/i386/acpi-dsdt-pci-crs.dsl | 92 + hw/i386/acpi-dsdt.dsl | 360 + hw/i386/acpi-dsdt.hex.generated | 4485 ++ hw/i386/bios-linker-loader.c | 157 + hw/i386/bios-linker-loader.h | 27 + hw/i386/kvm/apic.c | 16 +- hw/i386/kvm/clock.c | 5 +- hw/i386/kvm/i8254.c | 14 +- hw/i386/kvm/ioapic.c | 8 +- hw/i386/kvm/pci-assign.c | 102 +- hw/i386/kvmvapic.c | 20 +- hw/i386/pc.c | 159 +- hw/i386/pc_piix.c | 328 +- hw/i386/pc_q35.c | 160 +- hw/i386/pc_sysfw.c | 110 +- hw/i386/q35-acpi-dsdt.dsl | 452 + hw/i386/q35-acpi-dsdt.hex.generated | 7383 +++ hw/i386/smbios.c | 353 +- hw/i386/ssdt-misc.dsl | 119 + hw/i386/ssdt-misc.hex.generated | 386 + hw/i386/ssdt-pcihp.dsl | 100 + hw/i386/ssdt-pcihp.hex.generated | 251 + hw/i386/ssdt-proc.dsl | 63 + hw/i386/ssdt-proc.hex.generated | 134 + hw/i386/xen/Makefile.objs | 1 + hw/i386/xen/xen_apic.c | 97 + hw/i386/xen/xen_platform.c | 450 + hw/i386/xen/xen_pvdevice.c | 135 + hw/i386/xen_domainbuild.c | 299 - hw/i386/xen_domainbuild.h | 13 - hw/i386/xen_machine_pv.c | 110 - hw/ide/ahci.c | 28 +- hw/ide/ahci.h | 10 +- hw/ide/atapi.c | 16 +- hw/ide/cmd646.c | 4 +- hw/ide/core.c | 60 +- hw/ide/ich.c | 3 +- hw/ide/internal.h | 5 +- hw/ide/isa.c | 6 +- hw/ide/macio.c | 2 +- hw/ide/microdrive.c | 226 +- hw/ide/mmio.c | 2 +- hw/ide/pci.c | 2 +- hw/ide/piix.c | 12 +- hw/ide/qdev.c | 7 +- hw/ide/via.c | 3 +- hw/input/hid.c | 10 +- hw/input/lm832x.c | 30 +- hw/input/pckbd.c | 3 +- hw/input/pxa2xx_keypad.c | 6 +- hw/input/tsc2005.c | 16 +- hw/input/tsc210x.c | 32 +- hw/input/vmmouse.c | 3 +- hw/intc/Makefile.objs | 3 + hw/intc/allwinner-a10-pic.c | 200 + hw/intc/apic.c | 73 +- hw/intc/apic_common.c | 88 +- hw/intc/arm_gic.c | 224 +- hw/intc/arm_gic_common.c | 31 +- hw/intc/arm_gic_kvm.c | 447 +- hw/intc/armv7m_nvic.c | 16 +- hw/intc/etraxfs_pic.c | 4 + hw/intc/exynos4210_combiner.c | 2 +- hw/intc/gic_internal.h | 105 +- hw/intc/grlib_irqmp.c | 2 + hw/intc/i8259.c | 4 +- hw/intc/i8259_common.c | 14 +- hw/intc/ioapic.c | 16 +- hw/intc/ioapic_common.c | 16 +- hw/intc/omap_intc.c | 4 + hw/intc/openpic.c | 14 +- hw/intc/openpic_kvm.c | 14 +- hw/intc/pl190.c | 1 - hw/intc/realview_gic.c | 58 +- hw/intc/s390_flic.c | 322 + hw/intc/slavio_intctl.c | 2 +- hw/intc/xics.c | 387 +- hw/intc/xics_kvm.c | 503 + hw/intc/xilinx_intc.c | 3 +- hw/ipack/Makefile.objs | 2 + hw/ipack/ipack.c | 120 + hw/ipack/tpci200.c | 672 + hw/isa/isa-bus.c | 1 - hw/isa/lpc_ich9.c | 47 +- hw/isa/pc87312.c | 2 +- hw/isa/piix4.c | 8 +- hw/isa/vt82c686.c | 12 +- hw/lm32/lm32_boards.c | 12 +- hw/lm32/lm32_hwsetup.h | 2 +- hw/lm32/milkymist.c | 9 +- hw/m68k/an5206.c | 5 +- hw/m68k/dummy_m68k.c | 1 - hw/m68k/mcf5208.c | 5 +- hw/microblaze/Makefile.objs | 1 - hw/microblaze/boot.c | 54 +- hw/microblaze/boot.h | 4 +- hw/microblaze/petalogix_ml605_mmu.c | 74 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 45 +- hw/microblaze/pic_cpu.c | 47 - hw/microblaze/pic_cpu.h | 8 - hw/mips/cputimer.c | 16 +- hw/mips/gt64xxx_pci.c | 6 + hw/mips/mips_fulong2e.c | 3 +- hw/mips/mips_jazz.c | 26 +- hw/mips/mips_malta.c | 39 +- hw/mips/mips_mipssim.c | 5 +- hw/mips/mips_r4k.c | 1 - hw/misc/Makefile.objs | 5 +- hw/misc/a9scu.c | 25 +- hw/misc/applesmc.c | 3 +- hw/misc/arm11scu.c | 100 + hw/misc/arm_integrator_debug.c | 99 + hw/misc/arm_l2x0.c | 1 - hw/misc/arm_sysctl.c | 6 +- hw/misc/debugexit.c | 4 +- hw/misc/eccmemctl.c | 2 +- hw/misc/exynos4210_pmu.c | 3 +- hw/misc/ivshmem.c | 2 +- hw/misc/lm32_sys.c | 8 +- hw/misc/macio/cuda.c | 38 +- hw/misc/macio/macio.c | 17 +- hw/misc/max111x.c | 54 +- hw/misc/pvpanic.c | 12 +- hw/misc/pxa2xx_pcmcia.c | 207 - hw/misc/tmp105.c | 8 +- hw/misc/vfio.c | 945 +- hw/misc/vmport.c | 3 +- hw/misc/zynq_slcr.c | 5 + hw/moxie/moxiesim.c | 2 +- hw/net/Makefile.objs | 4 + hw/net/allwinner_emac.c | 539 + hw/net/cadence_gem.c | 278 +- hw/net/dp8393x.c | 20 +- hw/net/e1000.c | 244 +- hw/net/eepro100.c | 4 +- hw/net/etraxfs_eth.c | 2 + hw/net/fsl_etsec/etsec.c | 465 + hw/net/fsl_etsec/etsec.h | 174 + hw/net/fsl_etsec/miim.c | 146 + hw/net/fsl_etsec/registers.c | 295 + hw/net/fsl_etsec/registers.h | 320 + hw/net/fsl_etsec/rings.c | 650 + hw/net/lan9118.c | 10 +- hw/net/lance.c | 2 + hw/net/ne2000-isa.c | 2 +- hw/net/ne2000.c | 7 +- hw/net/opencores_eth.c | 33 +- hw/net/pcnet-pci.c | 7 +- hw/net/pcnet.c | 10 +- hw/net/rtl8139.c | 37 +- hw/net/smc91c111.c | 1 + hw/net/spapr_llan.c | 6 + hw/net/stellaris_enet.c | 3 +- hw/net/vhost_net.c | 8 +- hw/net/virtio-net.c | 164 +- hw/net/vmware_utils.h | 16 +- hw/net/vmxnet3.c | 93 +- hw/net/vmxnet3.h | 2 - hw/net/xilinx_axienet.c | 37 +- hw/nvram/eeprom93xx.c | 62 +- hw/nvram/fw_cfg.c | 40 +- hw/nvram/spapr_nvram.c | 17 +- hw/openrisc/cputimer.c | 35 +- hw/openrisc/openrisc_sim.c | 4 +- hw/openrisc/pic_cpu.c | 17 +- hw/pci-bridge/dec.c | 6 + hw/pci-bridge/pci_bridge_dev.c | 11 +- hw/pci-host/apb.c | 16 +- hw/pci-host/bonito.c | 8 +- hw/pci-host/grackle.c | 10 +- hw/pci-host/pam.c | 2 +- hw/pci-host/piix.c | 84 +- hw/pci-host/ppce500.c | 5 + hw/pci-host/prep.c | 248 +- hw/pci-host/q35.c | 96 +- hw/pci-host/uninorth.c | 28 +- hw/pci-host/versatile.c | 10 +- hw/pci/Makefile.objs | 2 +- hw/pci/msi.c | 2 +- hw/pci/msix.c | 2 +- hw/pci/pci-hotplug-old.c | 6 +- hw/pci/pci.c | 303 +- hw/pci/pci_bridge.c | 9 +- hw/pci/pci_host.c | 14 +- hw/pci/pcie.c | 75 +- hw/pci/pcie_aer.c | 8 +- hw/pci/pcie_host.c | 24 - hw/pci/pcie_port.c | 8 + hw/pci/shpc.c | 128 +- hw/pcmcia/Makefile.objs | 2 + hw/pcmcia/pcmcia.c | 24 + hw/pcmcia/pxa2xx.c | 285 + hw/ppc/Makefile.objs | 6 +- hw/ppc/e500.c | 306 +- hw/ppc/e500.h | 13 +- hw/ppc/e500plat.c | 21 +- hw/ppc/mac.h | 1 - hw/ppc/mac_newworld.c | 4 +- hw/ppc/mac_oldworld.c | 4 +- hw/ppc/mpc8544ds.c | 21 +- hw/ppc/ppc.c | 186 +- hw/ppc/ppc405_boards.c | 41 +- hw/ppc/ppc405_uc.c | 71 +- hw/ppc/ppc440_bamboo.c | 32 +- hw/ppc/ppc4xx_devs.c | 4 +- hw/ppc/ppc4xx_pci.c | 5 + hw/ppc/ppc_booke.c | 87 +- hw/ppc/ppce500_spin.c | 8 +- hw/ppc/prep.c | 155 +- hw/ppc/spapr.c | 331 +- hw/ppc/spapr_events.c | 6 +- hw/ppc/spapr_hcall.c | 221 +- hw/ppc/spapr_iommu.c | 108 +- hw/ppc/spapr_pci.c | 232 +- hw/ppc/spapr_rtas.c | 134 +- hw/ppc/spapr_vio.c | 17 +- hw/ppc/virtex_ml507.c | 97 +- hw/s390x/Makefile.objs | 1 + hw/s390x/css.c | 23 +- hw/s390x/css.h | 2 + hw/s390x/event-facility.c | 112 +- hw/s390x/ipl.c | 39 +- hw/s390x/s390-virtio-bus.c | 66 +- hw/s390x/s390-virtio-ccw.c | 22 +- hw/s390x/s390-virtio-hcall.c | 14 +- hw/s390x/s390-virtio.c | 13 +- hw/s390x/sclp.c | 122 +- hw/s390x/sclpcpu.c | 112 + hw/s390x/sclpquiesce.c | 29 +- hw/s390x/virtio-ccw.c | 260 +- hw/s390x/virtio-ccw.h | 5 +- hw/scsi/esp-pci.c | 5 +- hw/scsi/esp.c | 2 +- hw/scsi/lsi53c895a.c | 55 +- hw/scsi/megasas.c | 33 +- hw/scsi/scsi-bus.c | 78 +- hw/scsi/scsi-disk.c | 239 +- hw/scsi/scsi-generic.c | 4 +- hw/scsi/spapr_vscsi.c | 266 +- hw/scsi/srp.h | 7 + hw/scsi/vhost-scsi.c | 45 +- hw/scsi/virtio-scsi.c | 69 +- hw/scsi/vmw_pvscsi.c | 14 +- hw/sd/milkymist-memcard.c | 4 + hw/sd/omap_mmc.c | 6 + hw/sd/pl181.c | 5 +- hw/sd/pxa2xx_mmci.c | 3 + hw/sd/sd.c | 5 + hw/sd/sdhci.c | 36 +- hw/sd/ssi-sd.c | 10 +- hw/sh4/r2d.c | 5 +- hw/sh4/sh7750.c | 2 +- hw/sh4/sh_pci.c | 6 + hw/sh4/shix.c | 17 +- hw/sparc/leon3.c | 7 +- hw/sparc/sun4m.c | 213 +- hw/sparc64/sun4u.c | 82 +- hw/ssi/ssi.c | 11 +- hw/ssi/xilinx_spips.c | 4 +- hw/timer/Makefile.objs | 4 + hw/timer/a9gtimer.c | 369 + hw/timer/allwinner-a10-pit.c | 254 + hw/timer/arm_mptimer.c | 73 +- hw/timer/arm_timer.c | 3 + hw/timer/cadence_ttc.c | 6 +- hw/timer/digic-timer.c | 163 + hw/timer/ds1338.c | 21 +- hw/timer/etraxfs_timer.c | 2 +- hw/timer/exynos4210_mct.c | 3 +- hw/timer/exynos4210_pwm.c | 1 + hw/timer/exynos4210_rtc.c | 4 +- hw/timer/grlib_gptimer.c | 7 +- hw/timer/hpet.c | 51 +- hw/timer/i8254.c | 28 +- hw/timer/i8254_common.c | 11 +- hw/timer/imx_epit.c | 95 +- hw/timer/imx_gpt.c | 1 + hw/timer/lm32_timer.c | 1 + hw/timer/m48t59.c | 29 +- hw/timer/mc146818rtc.c | 76 +- hw/timer/omap_gptimer.c | 24 +- hw/timer/omap_synctimer.c | 2 +- hw/timer/pl031.c | 20 +- hw/timer/puv3_ost.c | 1 + hw/timer/pxa2xx_timer.c | 34 +- hw/timer/sh_timer.c | 1 + hw/timer/slavio_timer.c | 26 +- hw/timer/tusb6010.c | 12 +- hw/timer/twl92230.c | 49 +- hw/timer/xilinx_timer.c | 1 + hw/tpm/tpm_tis.c | 1 + hw/unicore32/puv3.c | 7 +- hw/usb/Makefile.objs | 5 +- hw/usb/bus.c | 36 +- hw/usb/ccid-card-emulated.c | 8 +- hw/usb/combined-packet.c | 1 + hw/usb/core.c | 25 + hw/usb/desc-msos.c | 234 + hw/usb/desc.c | 51 +- hw/usb/desc.h | 22 +- hw/usb/dev-audio.c | 2 +- hw/usb/dev-bluetooth.c | 12 +- hw/usb/dev-hid.c | 16 +- hw/usb/dev-hub.c | 4 +- hw/usb/dev-network.c | 7 +- hw/usb/dev-serial.c | 2 +- hw/usb/dev-smartcard-reader.c | 6 +- hw/usb/dev-storage.c | 14 +- hw/usb/dev-uas.c | 178 +- hw/usb/dev-wacom.c | 2 +- hw/usb/hcd-ehci-pci.c | 4 +- hw/usb/hcd-ehci.c | 31 +- hw/usb/hcd-ehci.h | 1 - hw/usb/hcd-musb.c | 8 +- hw/usb/hcd-ohci.c | 52 +- hw/usb/hcd-uhci.c | 27 +- hw/usb/hcd-xhci.c | 391 +- hw/usb/host-bsd.c | 639 - hw/usb/host-legacy.c | 2 +- hw/usb/host-libusb.c | 36 +- hw/usb/host-linux.c | 1911 - hw/usb/redirect.c | 16 +- hw/virtio/dataplane/Makefile.objs | 2 +- hw/virtio/dataplane/hostmem.c | 183 - hw/virtio/dataplane/vring.c | 253 +- hw/virtio/virtio-balloon.c | 47 +- hw/virtio/virtio-bus.c | 82 +- hw/virtio/virtio-mmio.c | 19 +- hw/virtio/virtio-pci.c | 162 +- hw/virtio/virtio-pci.h | 1 - hw/virtio/virtio-rng.c | 75 +- hw/virtio/virtio.c | 73 +- hw/watchdog/watchdog.c | 3 +- hw/watchdog/wdt_i6300esb.c | 6 +- hw/watchdog/wdt_ib700.c | 10 +- hw/xen/Makefile.objs | 1 - hw/xen/xen_apic.c | 95 - hw/xen/xen_backend.c | 19 +- hw/xen/xen_platform.c | 449 - hw/xen/xen_pt.c | 7 +- hw/xen/xen_pt_config_init.c | 6 +- hw/xen/xen_pt_msi.c | 6 +- hw/xen/xen_pvdevice.c | 131 - hw/xenpv/Makefile.objs | 2 + hw/xenpv/xen_domainbuild.c | 299 + hw/xenpv/xen_domainbuild.h | 13 + hw/xenpv/xen_machine_pv.c | 109 + hw/xtensa/pic_cpu.c | 10 +- hw/xtensa/xtensa_lx60.c | 53 +- hw/xtensa/xtensa_sim.c | 1 - include/block/aio.h | 82 +- include/block/block.h | 148 +- include/block/block_int.h | 169 +- include/block/blockjob.h | 16 +- include/block/coroutine.h | 19 +- include/block/nbd.h | 6 - include/block/qapi.h | 3 + include/block/snapshot.h | 29 +- include/disas/bfd.h | 1 + include/elf.h | 76 + include/exec/cpu-all.h | 29 +- include/exec/cpu-common.h | 45 +- include/exec/cpu-defs.h | 64 +- include/exec/cputlb.h | 6 +- include/exec/def-helper.h | 3 +- include/exec/exec-all.h | 153 +- include/exec/gen-icount.h | 14 +- include/exec/ioport.h | 2 + include/exec/memory-internal.h | 90 - include/exec/memory.h | 24 +- include/exec/ram_addr.h | 150 + include/exec/softmmu_defs.h | 37 - include/exec/softmmu_exec.h | 3 +- include/exec/softmmu_template.h | 609 +- include/exec/user/abitypes.h | 4 - include/fpu/softfloat.h | 111 +- include/hw/acpi/acpi.h | 15 +- include/hw/acpi/cpu_hotplug.h | 27 + include/hw/acpi/cpu_hotplug_defs.h | 32 + include/hw/acpi/ich9.h | 6 + include/hw/acpi/pcihp.h | 75 + include/hw/acpi/piix4.h | 8 + include/hw/arm/allwinner-a10.h | 38 + include/hw/arm/arm.h | 12 +- include/hw/arm/digic.h | 43 + include/hw/arm/exynos4210.h | 2 +- include/hw/arm/omap.h | 2 +- include/hw/arm/pxa.h | 12 +- include/hw/block/block.h | 6 - include/hw/boards.h | 71 +- include/hw/bt.h | 11 +- include/hw/char/digic-uart.h | 47 + include/hw/char/serial.h | 4 +- include/hw/cpu/a15mpcore.h | 44 + include/hw/cpu/a9mpcore.h | 39 + include/hw/cpu/arm11mpcore.h | 35 + include/hw/cpu/icc_bus.h | 2 +- include/hw/cris/etraxfs.h | 2 - include/hw/elf_ops.h | 19 +- include/hw/fw-path-provider.h | 48 + include/hw/hotplug.h | 78 + include/hw/i2c/i2c.h | 20 +- include/hw/i2c/pm_smbus.h | 2 +- include/hw/i2c/smbus.h | 20 +- include/hw/i386/apic_internal.h | 2 +- include/hw/i386/ich9.h | 6 +- include/hw/i386/ioapic_internal.h | 3 +- include/hw/i386/pc.h | 114 +- include/hw/i386/smbios.h | 7 +- include/hw/ide.h | 1 + include/hw/intc/allwinner-a10-pic.h | 40 + include/hw/intc/arm_gic.h | 42 + include/hw/intc/arm_gic_common.h | 127 + include/hw/intc/realview_gic.h | 28 + include/hw/ipack/ipack.h | 87 + include/hw/irq.h | 7 + include/hw/isa/isa.h | 9 +- include/hw/isa/vt82c686.h | 4 +- include/hw/loader.h | 28 +- include/hw/misc/a9scu.h | 31 + include/hw/misc/arm11scu.h | 29 + include/hw/misc/arm_integrator_debug.h | 18 + include/hw/net/allwinner_emac.h | 210 + include/hw/nvram/fw_cfg.h | 8 +- include/hw/nvram/openbios_firmware_abi.h | 2 + include/hw/pci-host/q35.h | 30 +- include/hw/pci-host/spapr.h | 8 +- include/hw/pci/pci.h | 66 +- include/hw/pci/pci_bus.h | 2 - include/hw/pci/pci_ids.h | 2 +- include/hw/pci/pcie.h | 23 +- include/hw/pci/pcie_host.h | 27 + include/hw/pci/shpc.h | 8 + include/hw/pcmcia.h | 46 +- include/hw/ppc/ppc.h | 7 +- include/hw/ppc/spapr.h | 46 +- include/hw/ppc/xics.h | 57 + include/hw/ptimer.h | 14 +- include/hw/qdev-core.h | 73 +- include/hw/qdev-dma.h | 2 +- include/hw/qdev-properties.h | 42 +- include/hw/s390x/ebcdic.h | 104 + include/hw/s390x/event-facility.h | 112 +- include/hw/s390x/s390_flic.h | 33 + include/hw/s390x/sclp.h | 99 +- include/hw/scsi/scsi.h | 13 +- include/hw/ssi.h | 3 +- include/hw/sysbus.h | 2 +- include/hw/timer/a9gtimer.h | 97 + include/hw/timer/allwinner-a10-pit.h | 58 + include/hw/timer/arm_mptimer.h | 54 + include/hw/timer/digic-timer.h | 46 + include/hw/timer/hpet.h | 10 + include/hw/usb.h | 46 +- include/hw/virtio/dataplane/hostmem.h | 58 - include/hw/virtio/dataplane/vring.h | 10 +- include/hw/virtio/virtio-blk.h | 8 +- include/hw/virtio/virtio-bus.h | 22 +- include/hw/virtio/virtio-rng.h | 2 + include/hw/virtio/virtio-scsi.h | 4 +- include/hw/virtio/virtio-serial.h | 8 +- include/hw/virtio/virtio.h | 8 +- include/hw/xen/xen.h | 2 +- include/hw/xen/xen_common.h | 7 + include/hw/xilinx.h | 96 - include/migration/migration.h | 12 + include/migration/page_cache.h | 4 +- include/migration/qemu-file.h | 4 + include/migration/vmstate.h | 40 +- include/monitor/monitor.h | 8 +- include/monitor/readline.h | 55 - include/net/checksum.h | 1 + include/net/eth.h | 6 +- include/net/net.h | 21 +- include/net/tap.h | 6 - include/qapi/error.h | 19 + include/qapi/opts-visitor.h | 6 + include/qapi/qmp/dispatch.h | 7 +- include/qapi/qmp/qdict.h | 3 + include/qapi/qmp/qerror.h | 5 +- include/qapi/qmp/qjson.h | 2 +- include/qapi/string-output-visitor.h | 2 +- include/qapi/visitor.h | 3 +- include/qemu-common.h | 17 +- include/qemu-io.h | 5 + include/qemu/atomic.h | 6 +- include/qemu/bitmap.h | 86 +- include/qemu/bitops.h | 14 +- include/qemu/bswap.h | 59 +- include/qemu/cache-utils.h | 4 +- include/qemu/config-file.h | 7 + include/qemu/crc32c.h | 4 +- include/qemu/fifo8.h | 61 + include/qemu/host-utils.h | 62 +- include/qemu/module.h | 23 +- include/qemu/option.h | 5 +- include/qemu/osdep.h | 36 + include/qemu/range.h | 20 +- include/qemu/ratelimit.h | 2 +- include/qemu/readline.h | 63 + include/qemu/rfifolock.h | 54 + include/qemu/seqlock.h | 72 + include/qemu/sockets.h | 1 + include/qemu/thread-posix.h | 8 + include/qemu/thread-win32.h | 4 + include/qemu/thread.h | 10 +- include/qemu/throttle.h | 110 + include/qemu/timer.h | 727 +- include/qemu/typedefs.h | 10 +- include/qom/cpu.h | 153 +- include/qom/object.h | 161 +- include/qom/object_interfaces.h | 62 + include/sysemu/arch_init.h | 2 +- include/sysemu/blockdev.h | 3 +- include/sysemu/char.h | 10 + include/sysemu/device_tree.h | 80 +- include/sysemu/dump.h | 138 + include/sysemu/iothread.h | 40 + include/sysemu/kvm.h | 73 +- include/sysemu/qtest.h | 28 +- include/sysemu/rng.h | 11 - include/sysemu/sysemu.h | 17 +- include/ui/console.h | 36 +- include/ui/input.h | 56 + include/ui/qemu-spice.h | 7 +- ioport.c | 9 + iothread.c | 167 + kvm-all.c | 285 +- kvm-stub.c | 6 +- libcacard/Makefile | 5 +- libcacard/cac.c | 1 - libcacard/card_7816.c | 2 +- libcacard/card_7816t.h | 2 +- libcacard/vcard_emul_nss.c | 1 - libcacard/vscclient.c | 19 +- linux-headers/asm-arm/kvm.h | 31 +- linux-headers/asm-arm64/kvm.h | 196 + linux-headers/asm-arm64/kvm_para.h | 1 + linux-headers/asm-mips/kvm.h | 81 +- linux-headers/asm-powerpc/kvm.h | 89 +- linux-headers/asm-s390/kvm.h | 19 + linux-headers/asm-x86/hyperv.h | 32 + linux-headers/asm-x86/kvm.h | 6 +- linux-headers/asm-x86/kvm_para.h | 1 + linux-headers/linux/kvm.h | 83 + linux-headers/linux/kvm_para.h | 1 + linux-headers/linux/vfio.h | 80 +- linux-headers/linux/virtio_config.h | 3 + linux-user/aarch64/syscall.h | 10 + linux-user/aarch64/syscall_nr.h | 323 + linux-user/aarch64/target_cpu.h | 38 + linux-user/aarch64/target_signal.h | 29 + linux-user/aarch64/target_structs.h | 58 + linux-user/aarch64/termbits.h | 220 + linux-user/alpha/syscall.h | 1 + linux-user/alpha/syscall_nr.h | 11 +- linux-user/alpha/target_structs.h | 48 + linux-user/arm/syscall.h | 1 + linux-user/arm/syscall_nr.h | 6 + linux-user/arm/target_cpu.h | 2 +- linux-user/arm/target_structs.h | 52 + linux-user/cpu-uname.c | 3 +- linux-user/cris/syscall.h | 2 +- linux-user/cris/syscall_nr.h | 1 + linux-user/cris/target_structs.h | 58 + linux-user/elfload.c | 53 +- linux-user/flatload.c | 5 +- linux-user/i386/syscall.h | 1 + linux-user/i386/syscall_nr.h | 6 + linux-user/i386/target_structs.h | 58 + linux-user/ioctls.h | 2 + linux-user/linuxload.c | 15 +- linux-user/m68k-sim.c | 3 +- linux-user/m68k/syscall.h | 2 +- linux-user/m68k/syscall_nr.h | 5 + linux-user/m68k/target_cpu.h | 4 +- linux-user/m68k/target_structs.h | 58 + linux-user/main.c | 478 +- linux-user/microblaze/syscall.h | 2 +- linux-user/microblaze/syscall_nr.h | 7 +- linux-user/microblaze/target_structs.h | 58 + linux-user/mips/syscall.h | 1 + linux-user/mips/syscall_nr.h | 6 + linux-user/mips/target_structs.h | 48 + linux-user/mips64/syscall.h | 1 + linux-user/mips64/syscall_nr.h | 13 + linux-user/mips64/target_cpu.h | 18 + linux-user/mips64/target_structs.h | 2 + linux-user/openrisc/syscall.h | 1 + linux-user/openrisc/syscall_nr.h | 6 +- linux-user/openrisc/target_structs.h | 58 + linux-user/ppc/syscall.h | 1 + linux-user/ppc/syscall_nr.h | 6 + linux-user/ppc/target_structs.h | 60 + linux-user/qemu.h | 22 +- linux-user/s390x/syscall.h | 3 +- linux-user/s390x/syscall_nr.h | 7 +- linux-user/s390x/target_structs.h | 63 + linux-user/sh4/syscall.h | 1 + linux-user/sh4/syscall_nr.h | 6 + linux-user/sh4/target_structs.h | 58 + linux-user/signal.c | 435 +- linux-user/sparc/syscall.h | 1 + linux-user/sparc/syscall_nr.h | 7 + linux-user/sparc/target_structs.h | 63 + linux-user/sparc64/syscall.h | 1 + linux-user/sparc64/syscall_nr.h | 7 + linux-user/sparc64/target_structs.h | 58 + linux-user/strace.list | 9 +- linux-user/syscall.c | 1163 +- linux-user/syscall_defs.h | 92 +- linux-user/syscall_types.h | 13 + linux-user/unicore32/syscall.h | 1 + linux-user/unicore32/target_structs.h | 58 + linux-user/vm86.c | 27 +- linux-user/x86_64/syscall.h | 1 + linux-user/x86_64/syscall_nr.h | 7 + linux-user/x86_64/target_structs.h | 58 + main-loop.c | 72 +- memory.c | 24 +- memory_mapping.c | 5 +- migration-exec.c | 1 + migration-fd.c | 1 + migration-rdma.c | 25 +- migration-tcp.c | 1 + migration-unix.c | 1 + migration.c | 115 +- module-common.c | 10 + monitor.c | 659 +- nbd.c | 74 +- net/Makefile.objs | 1 + net/clients.h | 5 + net/dump.c | 2 +- net/hub.c | 2 +- net/net.c | 128 +- net/netmap.c | 472 + net/slirp.c | 6 +- net/socket.c | 20 +- net/tap-linux.c | 14 +- net/tap-win32.c | 92 +- net/tap.c | 27 +- os-posix.c | 46 +- os-win32.c | 21 +- page_cache.c | 34 +- pc-bios/QEMU,cgthree.bin | Bin 0 -> 850 bytes pc-bios/QEMU,tcx.bin | Bin 0 -> 1410 bytes pc-bios/README | 10 +- pc-bios/acpi-dsdt.aml | Bin 4407 -> 4407 bytes pc-bios/bios-256k.bin | Bin 0 -> 262144 bytes pc-bios/bios.bin | Bin 131072 -> 131072 bytes pc-bios/keymaps/cz | 94 + pc-bios/kvmvapic.bin | Bin 9216 -> 9216 bytes pc-bios/multiboot.bin | Bin 1024 -> 1024 bytes pc-bios/ohw.diff | 1843 - pc-bios/openbios-ppc | Bin 733976 -> 734008 bytes pc-bios/openbios-sparc32 | Bin 381484 -> 381512 bytes pc-bios/openbios-sparc64 | Bin 1598328 -> 1598376 bytes pc-bios/optionrom/Makefile | 3 +- pc-bios/ppc_rom.bin | Bin 524288 -> 1048576 bytes pc-bios/q35-acpi-dsdt.aml | Bin 7344 -> 7344 bytes pc-bios/s390-ccw.img | Bin 9432 -> 9336 bytes pc-bios/s390-ccw/main.c | 3 +- pc-bios/s390-ccw/virtio.c | 8 +- pc-bios/s390-ccw/virtio.h | 1 + pc-bios/sgabios.bin | Bin 4096 -> 4096 bytes pc-bios/slof.bin | Bin 909720 -> 921720 bytes pc-bios/vgabios-cirrus.bin | Bin 35840 -> 36864 bytes pc-bios/vgabios-qxl.bin | Bin 40448 -> 37376 bytes pc-bios/vgabios-stdvga.bin | Bin 40448 -> 37376 bytes pc-bios/vgabios-vmware.bin | Bin 40448 -> 37376 bytes pc-bios/vgabios.bin | Bin 40448 -> 36864 bytes qapi-schema.json | 982 +- qapi/opts-visitor.c | 188 +- qapi/qapi-dealloc-visitor.c | 4 +- qapi/qmp-registry.c | 33 +- qapi/string-input-visitor.c | 24 + qapi/string-output-visitor.c | 56 +- qdev-monitor.c | 178 +- qemu-char.c | 63 +- qemu-coroutine-io.c | 1 + qemu-coroutine-lock.c | 8 - qemu-coroutine-sleep.c | 24 +- qemu-doc.texi | 57 +- qemu-file.c | 835 + qemu-img-cmds.hx | 16 +- qemu-img.c | 739 +- qemu-img.texi | 139 +- qemu-io-cmds.c | 95 +- qemu-io.c | 192 +- qemu-nbd.c | 124 +- qemu-nbd.texi | 10 +- qemu-options.hx | 49 +- qemu-seccomp.c | 9 +- qemu-timer.c | 931 +- qemu.nsi | 8 +- qemu.sasl | 4 +- qga/Makefile.objs | 3 + qga/channel-win32.c | 20 +- qga/commands-posix.c | 67 +- qga/commands-win32.c | 120 +- qga/commands.c | 39 +- qga/guest-agent-core.h | 2 +- qga/main.c | 103 +- qga/qapi-schema.json | 14 +- qga/vss-win32.c | 166 + qga/vss-win32.h | 27 + qga/vss-win32/Makefile.objs | 23 + qga/vss-win32/install.cpp | 465 + qga/vss-win32/provider.cpp | 534 + qga/vss-win32/qga-vss.def | 13 + qga/vss-win32/qga-vss.idl | 20 + qga/vss-win32/qga-vss.tlb | Bin 0 -> 1528 bytes qga/vss-win32/requester.cpp | 503 + qga/vss-win32/requester.h | 43 + qga/vss-win32/vss-common.h | 129 + qmp-commands.hx | 494 +- qmp.c | 99 +- qobject/qdict.c | 158 +- qobject/qerror.c | 12 +- qom/Makefile.objs | 1 + qom/cpu.c | 114 +- qom/object.c | 350 +- qom/object_interfaces.c | 32 + qtest.c | 47 +- readline.c | 494 - roms/Makefile | 102 +- roms/SLOF | 2 +- roms/config.seabios | 1 - roms/config.seabios-128k | 6 + roms/config.seabios-256k | 3 + roms/config.vga-cirrus | 3 + roms/config.vga-isavga | 3 + roms/config.vga-qxl | 6 + roms/config.vga-stdvga | 3 + roms/config.vga-vmware | 6 + roms/config.vga.cirrus | 3 - roms/config.vga.isavga | 3 - roms/config.vga.qxl | 6 - roms/config.vga.stdvga | 3 - roms/config.vga.vmware | 6 - roms/openbios | 2 +- roms/openhackware | 1 + roms/seabios | 2 +- rules.mak | 129 +- savevm.c | 1643 +- scripts/acpi_extract.py | 362 + scripts/acpi_extract_preprocess.py | 51 + scripts/checkpatch.pl | 34 +- scripts/create_config | 7 + scripts/disas-objdump.pl | 99 + scripts/dump-guest-memory.py | 339 + scripts/extract-vsssdk-headers | 35 + scripts/get_maintainer.pl | 2 +- scripts/make-release | 3 +- scripts/qapi-commands.py | 24 +- scripts/qapi-types.py | 70 +- scripts/qapi-visit.py | 84 +- scripts/qapi.py | 197 +- scripts/qemu-binfmt-conf.sh | 3 + scripts/qmp/qemu-ga-client | 301 + scripts/qmp/qmp | 126 + scripts/qmp/qmp-shell | 305 + scripts/qmp/qmp.py | 201 + scripts/qmp/qom-fuse | 138 + scripts/qmp/qom-get | 67 + scripts/qmp/qom-list | 64 + scripts/qmp/qom-set | 64 + scripts/refresh-pxe-roms.sh | 80 +- scripts/switch-timer-api | 178 + scripts/tracetool/backend/simple.py | 6 +- scripts/tracetool/backend/ust.py | 101 +- scripts/tracetool/format/ust_events_c.py | 30 + scripts/tracetool/format/ust_events_h.py | 57 + scripts/update-acpi.sh | 4 + slirp/arp_table.c | 4 +- slirp/if.c | 4 +- slirp/libslirp.h | 3 +- slirp/misc.c | 4 +- slirp/slirp.c | 65 +- slirp/slirp.h | 3 + slirp/socket.c | 2 +- slirp/tcp_subr.c | 6 +- slirp/tftp.c | 2 +- slirp/udp.c | 4 +- spice-qemu-char.c | 36 +- stubs/Makefile.objs | 4 + stubs/clock-warp.c | 2 +- stubs/gdbstub.c | 4 +- stubs/kvm.c | 7 + stubs/qtest.c | 14 + stubs/runstate-check.c | 6 + stubs/slirp.c | 6 +- stubs/uuid.c | 12 + target-alpha/cpu-qom.h | 2 +- target-alpha/cpu.c | 26 +- target-alpha/cpu.h | 20 +- target-alpha/helper.c | 45 +- target-alpha/helper.h | 12 +- target-alpha/mem_helper.c | 52 +- target-alpha/sys_helper.c | 33 +- target-alpha/translate.c | 156 +- target-arm/Makefile.objs | 6 +- target-arm/arm-semi.c | 9 +- target-arm/cpu-qom.h | 50 + target-arm/cpu.c | 240 +- target-arm/cpu.h | 583 +- target-arm/cpu64.c | 133 + target-arm/crypto_helper.c | 281 + target-arm/gdbstub64.c | 73 + target-arm/helper-a64.c | 438 + target-arm/helper-a64.h | 48 + target-arm/helper.c | 2440 +- target-arm/helper.h | 105 +- target-arm/kvm-consts.h | 115 + target-arm/kvm.c | 527 +- target-arm/kvm32.c | 515 + target-arm/kvm64.c | 204 + target-arm/kvm_arm.h | 72 +- target-arm/machine.c | 24 +- target-arm/neon_helper.c | 217 +- target-arm/op_helper.c | 113 +- target-arm/translate-a64.c |10448 ++++ target-arm/translate.c | 1272 +- target-arm/translate.h | 80 + target-cris/cpu.c | 53 +- target-cris/cpu.h | 16 +- target-cris/helper.c | 51 +- target-cris/helper.h | 8 +- target-cris/mmu.c | 3 +- target-cris/op_helper.c | 28 +- target-cris/translate.c | 55 +- target-cris/translate_v10.c | 16 +- target-i386/Makefile.objs | 4 +- target-i386/arch_memory_mapping.c | 48 +- target-i386/cc_helper.c | 2 +- target-i386/cpu-qom.h | 29 + target-i386/cpu.c | 834 +- target-i386/cpu.h | 579 +- target-i386/excp_helper.c | 6 +- target-i386/fpu_helper.c | 15 +- target-i386/gdbstub.c | 2 +- target-i386/helper.c | 159 +- target-i386/helper.h | 1 + target-i386/hyperv.c | 64 - target-i386/hyperv.h | 45 - target-i386/kvm-stub.c | 12 + target-i386/kvm.c | 377 +- target-i386/machine.c | 197 +- target-i386/mem_helper.c | 16 +- target-i386/misc_helper.c | 46 +- target-i386/seg_helper.c | 32 +- target-i386/smm_helper.c | 300 +- target-i386/svm_helper.c | 326 +- target-i386/translate.c | 2815 +- target-lm32/TODO | 2 - target-lm32/cpu-qom.h | 6 + target-lm32/cpu.c | 202 +- target-lm32/cpu.h | 43 +- target-lm32/helper.c | 256 +- target-lm32/helper.h | 4 + target-lm32/op_helper.c | 98 +- target-lm32/translate.c | 200 +- target-m68k/cpu.c | 14 +- target-m68k/cpu.h | 9 +- target-m68k/helper.c | 26 +- target-m68k/helper.h | 54 + target-m68k/helpers.h | 54 - target-m68k/m68k-semi.c | 5 +- target-m68k/op_helper.c | 36 +- target-m68k/qregs.def | 1 - target-m68k/translate.c | 56 +- target-microblaze/cpu.c | 35 +- target-microblaze/cpu.h | 13 +- target-microblaze/helper.c | 34 +- target-microblaze/mmu.c | 6 +- target-microblaze/op_helper.c | 19 +- target-microblaze/translate.c | 292 +- target-mips/cpu.c | 38 +- target-mips/cpu.h | 51 +- target-mips/dsp_helper.c | 30 +- target-mips/helper.c | 66 +- target-mips/helper.h | 16 +- target-mips/machine.c | 3 +- target-mips/mips-defs.h | 8 + target-mips/op_helper.c | 99 +- target-mips/translate.c | 252 +- target-mips/translate_init.c | 65 +- target-moxie/cpu.c | 28 +- target-moxie/cpu.h | 7 +- target-moxie/helper.c | 52 +- target-moxie/translate.c | 6 +- target-openrisc/cpu.c | 35 +- target-openrisc/cpu.h | 13 +- target-openrisc/exception.c | 6 +- target-openrisc/interrupt.c | 37 +- target-openrisc/interrupt_helper.c | 2 +- target-openrisc/mmu.c | 30 +- target-openrisc/mmu_helper.c | 8 +- target-openrisc/sys_helper.c | 60 +- target-openrisc/translate.c | 205 +- target-ppc/Makefile.objs | 4 +- target-ppc/STATUS | 9 - target-ppc/arch_dump.c | 253 + target-ppc/cpu-models.c | 5 +- target-ppc/cpu-models.h | 8 +- target-ppc/cpu-qom.h | 17 +- target-ppc/cpu.h | 87 +- target-ppc/excp_helper.c | 99 +- target-ppc/fpu_helper.c | 1312 +- target-ppc/helper.h | 217 +- target-ppc/helper_regs.h | 6 +- target-ppc/int_helper.c | 1411 +- target-ppc/kvm.c | 202 +- target-ppc/kvm_ppc.c | 7 +- target-ppc/kvm_ppc.h | 36 +- target-ppc/machine.c | 17 +- target-ppc/mem_helper.c | 2 + target-ppc/misc_helper.c | 8 +- target-ppc/mmu-hash32.c | 35 +- target-ppc/mmu-hash32.h | 18 +- target-ppc/mmu-hash64.c | 145 +- target-ppc/mmu-hash64.h | 47 +- target-ppc/mmu_helper.c | 215 +- target-ppc/translate.c | 1834 +- target-ppc/translate_init.c | 503 +- target-ppc/user_only_helper.c | 8 +- target-s390x/arch_dump.c | 7 +- target-s390x/cc_helper.c | 5 +- target-s390x/cpu-qom.h | 6 + target-s390x/cpu.c | 89 +- target-s390x/cpu.h | 70 +- target-s390x/fpu_helper.c | 4 +- target-s390x/helper.c | 96 +- target-s390x/int_helper.c | 3 +- target-s390x/ioinst.c | 111 +- target-s390x/ioinst.h | 28 +- target-s390x/kvm.c | 564 +- target-s390x/mem_helper.c | 61 +- target-s390x/misc_helper.c | 218 +- target-s390x/translate.c | 16 +- target-sh4/cpu.c | 30 +- target-sh4/cpu.h | 17 +- target-sh4/helper.c | 108 +- target-sh4/op_helper.c | 20 +- target-sh4/translate.c | 177 +- target-sparc/cpu.c | 118 +- target-sparc/cpu.h | 19 +- target-sparc/helper.c | 53 +- target-sparc/helper.h | 22 +- target-sparc/int32_helper.c | 10 +- target-sparc/int64_helper.c | 8 +- target-sparc/ldst_helper.c | 145 +- target-sparc/machine.c | 3 +- target-sparc/mmu_helper.c | 60 +- target-sparc/translate.c | 61 +- target-unicore32/cpu.c | 13 +- target-unicore32/cpu.h | 11 +- target-unicore32/helper.c | 31 +- target-unicore32/op_helper.c | 16 +- target-unicore32/softmmu.c | 32 +- target-unicore32/translate.c | 37 +- target-unicore32/ucf64_helper.c | 3 +- target-xtensa/core-dc232b.c | 8 +- target-xtensa/core-dc233c.c | 7 +- target-xtensa/core-fsf.c | 8 +- target-xtensa/cpu.c | 10 + target-xtensa/cpu.h | 17 +- target-xtensa/helper.c | 33 +- target-xtensa/helper.h | 1 + target-xtensa/op_helper.c | 62 +- target-xtensa/overlay_tool.h | 17 + target-xtensa/translate.c | 100 +- tcg/README | 43 +- tcg/aarch64/tcg-target.c | 1060 +- tcg/aarch64/tcg-target.h | 53 +- tcg/arm/tcg-target.c | 843 +- tcg/arm/tcg-target.h | 13 +- tcg/hppa/tcg-target.c | 1829 - tcg/hppa/tcg-target.h | 126 - tcg/i386/tcg-target.c | 1121 +- tcg/i386/tcg-target.h | 28 +- tcg/ia64/tcg-target.c | 778 +- tcg/ia64/tcg-target.h | 13 +- tcg/mips/tcg-target.c | 259 +- tcg/mips/tcg-target.h | 59 +- tcg/optimize.c | 208 +- tcg/ppc/tcg-target.c | 696 +- tcg/ppc/tcg-target.h | 6 +- tcg/ppc64/tcg-target.c | 1206 +- tcg/ppc64/tcg-target.h | 10 +- tcg/s390/tcg-target.c | 129 +- tcg/s390/tcg-target.h | 9 +- tcg/sparc/tcg-target.c | 613 +- tcg/sparc/tcg-target.h | 30 +- tcg/tcg-be-ldst.h | 90 + tcg/tcg-be-null.h | 43 + tcg/tcg-op.h | 281 +- tcg/tcg-opc.h | 100 +- tcg/tcg.c | 481 +- tcg/tcg.h | 254 +- tcg/tci/tcg-target.c | 15 +- tcg/tci/tcg-target.h | 20 +- tci.c | 4 +- tests/.gitignore | 4 + tests/Makefile | 164 +- tests/acpi-test-data/pc/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/pc/DSDT | Bin 0 -> 4480 bytes tests/acpi-test-data/pc/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/pc/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/pc/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/pc/SSDT | Bin 0 -> 2269 bytes tests/acpi-test-data/q35/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/q35/DSDT | Bin 0 -> 7378 bytes tests/acpi-test-data/q35/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/q35/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/q35/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/q35/MCFG | Bin 0 -> 60 bytes tests/acpi-test-data/q35/SSDT | Bin 0 -> 550 bytes tests/acpi-test-data/rebuild-expected-aml.sh | 36 + tests/acpi-test.c | 674 + tests/blockdev-test.c | 59 + tests/boot-order-test.c | 6 +- tests/check-qdict.c | 219 + tests/check-qom-interface.c | 105 + tests/e1000-test.c | 33 + tests/eepro100-test.c | 63 + tests/endianness-test.c | 11 +- tests/fdc-test.c | 20 +- tests/fw_cfg-test.c | 10 +- tests/hd-geo-test.c | 2 +- tests/i440fx-test.c | 176 +- tests/i82801b11-test.c | 33 + tests/ide-test.c | 39 +- tests/ipoctal232-test.c | 33 + tests/libqos/pci-pc.c | 12 +- tests/libqtest.c | 222 +- tests/libqtest.h | 85 +- tests/m48t59-test.c | 5 +- tests/multiboot/Makefile | 18 + tests/multiboot/libc.c | 139 + tests/multiboot/libc.h | 61 + tests/multiboot/link.ld | 19 + tests/multiboot/mmap.c | 56 + tests/multiboot/mmap.out | 93 + tests/multiboot/multiboot.h | 66 + tests/multiboot/run_test.sh | 81 + tests/multiboot/start.S | 51 + tests/ne2000-test.c | 33 + tests/nvme-test.c | 34 + tests/pcnet-test.c | 33 + tests/pvpanic-test.c | 47 + tests/qapi-schema/comments.out | 2 +- tests/qapi-schema/duplicate-key.err | 1 + tests/qapi-schema/duplicate-key.exit | 1 + tests/qapi-schema/duplicate-key.json | 2 + .../qapi-schema/flat-union-invalid-branch-key.err | 1 + .../qapi-schema/flat-union-invalid-branch-key.exit | 1 + .../qapi-schema/flat-union-invalid-branch-key.json | 17 + .../flat-union-invalid-discriminator.err | 1 + .../flat-union-invalid-discriminator.exit | 1 + .../flat-union-invalid-discriminator.json | 17 + tests/qapi-schema/flat-union-no-base.err | 1 + tests/qapi-schema/flat-union-no-base.exit | 1 + tests/qapi-schema/flat-union-no-base.json | 10 + tests/qapi-schema/flat-union-reverse-define.exit | 1 + tests/qapi-schema/flat-union-reverse-define.json | 17 + tests/qapi-schema/flat-union-reverse-define.out | 9 + .../flat-union-string-discriminator.err | 1 + .../flat-union-string-discriminator.exit | 1 + .../flat-union-string-discriminator.json | 17 + tests/qapi-schema/qapi-schema-test.json | 42 +- tests/qapi-schema/qapi-schema-test.out | 24 +- tests/qapi-schema/union-invalid-base.err | 1 + tests/qapi-schema/union-invalid-base.exit | 1 + tests/qapi-schema/union-invalid-base.json | 10 + tests/qdev-monitor-test.c | 77 + tests/qemu-iotests-quick.sh | 1 + tests/qemu-iotests/.gitignore | 1 + tests/qemu-iotests/001 | 6 +- tests/qemu-iotests/002 | 36 +- tests/qemu-iotests/003 | 10 +- tests/qemu-iotests/004 | 24 +- tests/qemu-iotests/005 | 6 +- tests/qemu-iotests/007 | 4 +- tests/qemu-iotests/008 | 6 +- tests/qemu-iotests/009 | 2 +- tests/qemu-iotests/010 | 2 +- tests/qemu-iotests/011 | 2 +- tests/qemu-iotests/012 | 4 +- tests/qemu-iotests/013 | 6 +- tests/qemu-iotests/013.out |44080 +++++++------- tests/qemu-iotests/014 | 4 +- tests/qemu-iotests/014.out |64204 ++++++++++---------- tests/qemu-iotests/015 | 16 +- tests/qemu-iotests/016 | 14 +- tests/qemu-iotests/017 | 3 +- tests/qemu-iotests/017.out | 1080 +- tests/qemu-iotests/018 | 9 +- tests/qemu-iotests/018.out | 1080 +- tests/qemu-iotests/019 | 21 +- tests/qemu-iotests/019.out | 1636 +- tests/qemu-iotests/020 | 20 +- tests/qemu-iotests/020.out | 1080 +- tests/qemu-iotests/021 | 2 +- tests/qemu-iotests/022.out | 8816 ++-- tests/qemu-iotests/023 | 6 +- tests/qemu-iotests/023.out |26800 ++++---- tests/qemu-iotests/024 | 14 +- tests/qemu-iotests/024.out | 164 +- tests/qemu-iotests/025 | 6 +- tests/qemu-iotests/025.out | 18 +- tests/qemu-iotests/026 | 25 +- tests/qemu-iotests/026.out | 50 +- tests/qemu-iotests/026.out.nocache | 610 + tests/qemu-iotests/027 | 10 +- tests/qemu-iotests/028 | 8 +- tests/qemu-iotests/028.out | 458 +- tests/qemu-iotests/029 | 52 +- tests/qemu-iotests/029.out | 17 + tests/qemu-iotests/030 | 20 +- tests/qemu-iotests/031 | 14 +- tests/qemu-iotests/031.out | 12 +- tests/qemu-iotests/032 | 4 +- tests/qemu-iotests/032.out | 68 +- tests/qemu-iotests/033 | 18 +- tests/qemu-iotests/034 | 69 +- tests/qemu-iotests/035 | 2 +- tests/qemu-iotests/035.out | 2 +- tests/qemu-iotests/036 | 8 +- tests/qemu-iotests/036.out | 2 +- tests/qemu-iotests/037 | 67 +- tests/qemu-iotests/037.out | 616 +- tests/qemu-iotests/038 | 15 +- tests/qemu-iotests/038.out | 724 +- tests/qemu-iotests/039 | 53 +- tests/qemu-iotests/039.out | 15 +- tests/qemu-iotests/040 | 119 +- tests/qemu-iotests/041 | 41 + tests/qemu-iotests/041.out | 4 +- tests/qemu-iotests/042 | 10 +- tests/qemu-iotests/043 | 34 +- tests/qemu-iotests/044.out | 2 +- tests/qemu-iotests/045 | 51 +- tests/qemu-iotests/045.out | 4 +- tests/qemu-iotests/046 | 30 +- tests/qemu-iotests/046.out | 232 +- tests/qemu-iotests/047 | 2 +- tests/qemu-iotests/047.out | 20 +- tests/qemu-iotests/048 | 15 +- tests/qemu-iotests/048.out | 29 +- tests/qemu-iotests/049 | 36 +- tests/qemu-iotests/049.out | 18 +- tests/qemu-iotests/050 | 20 +- tests/qemu-iotests/051 | 124 +- tests/qemu-iotests/051.out | 296 +- tests/qemu-iotests/052 | 11 +- tests/qemu-iotests/053 | 10 +- tests/qemu-iotests/054 | 4 +- tests/qemu-iotests/054.out | 4 +- tests/qemu-iotests/055 | 14 +- tests/qemu-iotests/057 | 259 + tests/qemu-iotests/057.out | 5 + tests/qemu-iotests/058 | 138 + tests/qemu-iotests/058.out | 44 + tests/qemu-iotests/059 | 58 +- tests/qemu-iotests/059.out | 100 +- tests/qemu-iotests/060 | 170 + tests/qemu-iotests/060.out | 96 + tests/qemu-iotests/061 | 215 + tests/qemu-iotests/061.out | 387 + tests/qemu-iotests/062 | 64 + tests/qemu-iotests/062.out | 9 + tests/qemu-iotests/063 | 100 + tests/qemu-iotests/063.out | 10 + tests/qemu-iotests/064 | 73 + tests/qemu-iotests/064.out | 28 + tests/qemu-iotests/065 | 125 + tests/qemu-iotests/065.out | 5 + tests/qemu-iotests/066 | 63 + tests/qemu-iotests/066.out | 13 + tests/qemu-iotests/067 | 133 + tests/qemu-iotests/067.out | 80 + tests/qemu-iotests/068 | 65 + tests/qemu-iotests/068.out | 11 + tests/qemu-iotests/069 | 60 + tests/qemu-iotests/069.out | 8 + tests/qemu-iotests/070 | 78 + tests/qemu-iotests/070.out | 21 + tests/qemu-iotests/071 | 239 + tests/qemu-iotests/071.out | 90 + tests/qemu-iotests/072 | 69 + tests/qemu-iotests/072.out | 21 + tests/qemu-iotests/073 | 166 + tests/qemu-iotests/073.out | 118 + tests/qemu-iotests/074 | 86 + tests/qemu-iotests/074.out | 18 + tests/qemu-iotests/075 | 106 + tests/qemu-iotests/075.out | 38 + tests/qemu-iotests/076 | 76 + tests/qemu-iotests/076.out | 18 + tests/qemu-iotests/077 | 278 + tests/qemu-iotests/077.out | 202 + tests/qemu-iotests/078 | 91 + tests/qemu-iotests/078.out | 28 + tests/qemu-iotests/079 | 63 + tests/qemu-iotests/079.out | 32 + tests/qemu-iotests/080 | 180 + tests/qemu-iotests/080.out | 83 + tests/qemu-iotests/081 | 149 + tests/qemu-iotests/081.out | 49 + tests/qemu-iotests/082 | 208 + tests/qemu-iotests/082.out | 529 + tests/qemu-iotests/083 | 129 + tests/qemu-iotests/083.out | 163 + tests/qemu-iotests/084 | 104 + tests/qemu-iotests/084.out | 33 + tests/qemu-iotests/085 | 192 + tests/qemu-iotests/085.out | 55 + tests/qemu-iotests/086 | 65 + tests/qemu-iotests/086.out | 18 + tests/qemu-iotests/087 | 139 + tests/qemu-iotests/087.out | 49 + tests/qemu-iotests/088 | 64 + tests/qemu-iotests/088.out | 17 + tests/qemu-iotests/check | 242 +- tests/qemu-iotests/common | 497 +- tests/qemu-iotests/common.config | 17 +- tests/qemu-iotests/common.filter | 56 +- tests/qemu-iotests/common.pattern | 16 +- tests/qemu-iotests/common.rc | 214 +- tests/qemu-iotests/group | 43 +- tests/qemu-iotests/iotests.py | 50 +- tests/qemu-iotests/nbd-fault-injector.py | 264 + tests/qemu-iotests/sample_images/README | 8 + tests/qemu-iotests/sample_images/empty.bochs.bz2 | Bin 0 -> 118 bytes .../qemu-iotests/sample_images/fake.parallels.bz2 | Bin 0 -> 141 bytes .../sample_images/iotest-dirtylog-10G-4M.vhdx.bz2 | Bin 0 -> 4490 bytes .../sample_images/iotest-dynamic-1G.vhdx.bz2 | Bin 0 -> 874 bytes .../sample_images/iotest-version3.vmdk.bz2 | Bin 0 -> 414 bytes .../sample_images/simple-pattern.cloop.bz2 | Bin 0 -> 488 bytes tests/qemu-iotests/socket_scm_helper.c | 135 + tests/qom-test.c | 138 + tests/rtc-test.c | 7 +- tests/rtl8139-test.c | 33 + tests/spapr-phb-test.c | 35 + tests/tcg/lm32/Makefile | 8 +- tests/tcg/openrisc/test_addc.c | 8 +- tests/tcg/openrisc/test_addic.c | 10 +- tests/tcg/test_path.c | 13 +- tests/tcg/xtensa/Makefile | 12 +- tests/tcg/xtensa/macros.inc | 6 + tests/tcg/xtensa/test_b.S | 2 +- tests/tcg/xtensa/test_bi.S | 2 +- tests/tcg/xtensa/test_boolean.S | 2 +- tests/tcg/xtensa/test_break.S | 2 +- tests/tcg/xtensa/test_bz.S | 2 +- tests/tcg/xtensa/test_cache.S | 97 + tests/tcg/xtensa/test_clamps.S | 2 +- tests/tcg/xtensa/test_extui.S | 2 +- tests/tcg/xtensa/test_fail.S | 2 +- tests/tcg/xtensa/test_interrupt.S | 2 +- tests/tcg/xtensa/test_loop.S | 2 +- tests/tcg/xtensa/test_mac16.S | 2 +- tests/tcg/xtensa/test_max.S | 2 +- tests/tcg/xtensa/test_min.S | 2 +- tests/tcg/xtensa/test_mmu.S | 6 +- tests/tcg/xtensa/test_mul16.S | 2 +- tests/tcg/xtensa/test_mul32.S | 2 +- tests/tcg/xtensa/test_nsa.S | 2 +- tests/tcg/xtensa/test_pipeline.S | 2 +- tests/tcg/xtensa/test_quo.S | 2 +- tests/tcg/xtensa/test_rem.S | 2 +- tests/tcg/xtensa/test_rst0.S | 2 +- tests/tcg/xtensa/test_s32c1i.S | 2 +- tests/tcg/xtensa/test_sar.S | 2 +- tests/tcg/xtensa/test_sext.S | 2 +- tests/tcg/xtensa/test_shift.S | 2 +- tests/tcg/xtensa/test_sr.S | 2 +- tests/tcg/xtensa/test_timer.S | 2 +- tests/tcg/xtensa/test_windowed.S | 2 +- tests/test-aio.c | 297 +- tests/test-bitops.c | 4 +- tests/test-coroutine.c | 99 +- tests/test-int128.c | 15 +- tests/test-opts-visitor.c | 275 + tests/test-qdev-global-props.c | 180 + tests/test-qmp-commands.c | 78 +- tests/test-qmp-input-strict.c | 88 +- tests/test-qmp-input-visitor.c | 69 +- tests/test-qmp-output-visitor.c | 91 +- tests/test-rfifolock.c | 91 + tests/test-string-input-visitor.c | 20 +- tests/test-string-output-visitor.c | 16 +- tests/test-thread-pool.c | 27 +- tests/test-throttle.c | 481 + tests/test-visitor-serialization.c | 16 +- tests/test-vmstate.c | 357 + tests/tmp105-test.c | 141 +- tests/tpci200-test.c | 33 + tests/virtio-9p-test.c | 46 + tests/virtio-balloon-test.c | 33 + tests/virtio-blk-test.c | 34 + tests/virtio-console-test.c | 41 + tests/virtio-net-test.c | 33 + tests/virtio-rng-test.c | 33 + tests/virtio-scsi-test.c | 35 + tests/virtio-serial-test.c | 33 + tests/vmxnet3-test.c | 33 + thread-pool.c | 14 +- tpm.c | 2 +- trace-events | 102 +- trace/Makefile.objs | 25 + trace/control-internal.h | 10 +- trace/simple.c | 33 +- translate-all.c | 173 +- translate-all.h | 9 +- ui/Makefile.objs | 8 +- ui/cocoa.m | 182 +- ui/console.c | 151 +- ui/curses.c | 91 +- ui/gtk.c | 228 +- ui/input-legacy.c | 468 + ui/input.c | 697 +- ui/keymaps.c | 6 + ui/sdl.c | 151 +- ui/sdl2-keymap.h | 266 + ui/sdl2.c | 834 + ui/sdl_keysym.h | 3 +- ui/spice-core.c | 100 +- ui/spice-display.c | 116 +- ui/spice-input.c | 84 +- ui/vnc-auth-sasl.h | 1 + ui/vnc-auth-vencrypt.c | 2 +- ui/vnc-enc-tight.c | 2 +- ui/vnc-enc-zywrle.h | 2 +- ui/vnc-jobs.c | 8 +- ui/vnc-ws.c | 1 + ui/vnc.c | 300 +- ui/vnc.h | 11 +- ui/vnc_keysym.h | 373 + user-exec.c | 28 +- util/Makefile.objs | 4 + util/bitmap.c | 60 +- util/cache-utils.c | 51 +- util/compatfd.c | 17 +- util/cutils.c | 14 + util/error.c | 63 +- util/fifo8.c | 47 + util/getauxval.c | 74 + util/host-utils.c | 75 + util/iov.c | 115 +- util/module.c | 147 +- util/osdep.c | 26 +- util/oslib-posix.c | 97 +- util/oslib-win32.c | 64 +- util/path.c | 4 +- util/qemu-config.c | 191 +- util/qemu-option.c | 95 +- util/qemu-progress.c | 11 +- util/qemu-sockets.c | 24 +- util/qemu-thread-posix.c | 145 +- util/qemu-thread-win32.c | 38 +- util/readline.c | 495 + util/rfifolock.c | 78 + util/throttle.c | 396 + version.rc | 4 +- vl.c | 650 +- vmstate.c | 653 + xen-all.c | 1228 - xen-common-stub.c | 19 + xen-common.c | 123 + xen-hvm-stub.c | 61 + xen-hvm.c | 1129 + xen-stub.c | 70 - 1729 files changed, 218601 insertions(+), 122912 deletions(-) diff --git a/.gitignore b/.gitignore index 0fe114d..de90463 100644 --- a/.gitignore +++ b/.gitignore @@ -1,65 +1,75 @@ -config-devices.* -config-all-devices.* -config-all-disas.* -config-host.* -config-target.* -trace/generated-tracers.h -trace/generated-tracers.c -trace/generated-tracers-dtrace.h -trace/generated-tracers.dtrace -trace/generated-events.h -trace/generated-events.c -libcacard/trace/generated-tracers.c +/config-devices.* +/config-all-devices.* +/config-all-disas.* +/config-host.* +/config-target.* +/config.status +/trace/generated-tracers.h +/trace/generated-tracers.c +/trace/generated-tracers-dtrace.h +/trace/generated-tracers.dtrace +/trace/generated-events.h +/trace/generated-events.c +/trace/generated-ust-provider.h +/trace/generated-ust.c +/libcacard/trace/generated-tracers.c *-timestamp -*-softmmu -*-darwin-user -*-linux-user -*-bsd-user +/*-softmmu +/*-darwin-user +/*-linux-user +/*-bsd-user libdis* libuser -linux-headers/asm -qapi-generated -qapi-types.[ch] -qapi-visit.[ch] -qmp-commands.h -qmp-marshal.c -qemu-doc.html -qemu-tech.html -qemu-doc.info -qemu-tech.info -qemu.1 -qemu.pod -qemu-img.1 -qemu-img.pod -qemu-img -qemu-nbd -qemu-nbd.8 -qemu-nbd.pod -qemu-options.def -qemu-options.texi -qemu-img-cmds.texi -qemu-img-cmds.h -qemu-io -qemu-ga -qemu-bridge-helper -qemu-monitor.texi -vscclient -QMP/qmp-commands.txt -test-coroutine -test-qmp-input-visitor -test-qmp-output-visitor -test-string-input-visitor -test-string-output-visitor -test-visitor-serialization -fsdev/virtfs-proxy-helper -fsdev/virtfs-proxy-helper.1 -fsdev/virtfs-proxy-helper.pod -.gdbinit +/linux-headers/asm +/qga/qapi-generated +/qapi-generated +/qapi-types.[ch] +/qapi-visit.[ch] +/qmp-commands.h +/qmp-marshal.c +/qemu-doc.html +/qemu-tech.html +/qemu-doc.info +/qemu-tech.info +/qemu.1 +/qemu.pod +/qemu-img.1 +/qemu-img.pod +/qemu-img +/qemu-nbd +/qemu-nbd.8 +/qemu-nbd.pod +/qemu-options.def +/qemu-options.texi +/qemu-img-cmds.texi +/qemu-img-cmds.h +/qemu-io +/qemu-ga +/qemu-bridge-helper +/qemu-monitor.texi +/qmp-commands.txt +/vscclient +/test-bitops +/test-coroutine +/test-int128 +/test-opts-visitor +/test-qmp-input-visitor +/test-qmp-output-visitor +/test-string-input-visitor +/test-string-output-visitor +/test-visitor-serialization +/fsdev/virtfs-proxy-helper +/fsdev/virtfs-proxy-helper.1 +/fsdev/virtfs-proxy-helper.pod +/.gdbinit *.a *.aux *.cp *.dvi *.exe +*.dll +*.so +*.mo *.fn *.ky *.log @@ -73,34 +83,35 @@ fsdev/virtfs-proxy-helper.pod *.tp *.vr *.d -!scripts/qemu-guest-agent/fsfreeze-hook.d +!/scripts/qemu-guest-agent/fsfreeze-hook.d *.o *.lo *.la *.pc .libs +.sdk *.swp *.orig .pc *.gcda *.gcno patches -pc-bios/bios-pq/status -pc-bios/vgabios-pq/status -pc-bios/optionrom/linuxboot.asm -pc-bios/optionrom/linuxboot.bin -pc-bios/optionrom/linuxboot.raw -pc-bios/optionrom/linuxboot.img -pc-bios/optionrom/multiboot.asm -pc-bios/optionrom/multiboot.bin -pc-bios/optionrom/multiboot.raw -pc-bios/optionrom/multiboot.img -pc-bios/optionrom/kvmvapic.asm -pc-bios/optionrom/kvmvapic.bin -pc-bios/optionrom/kvmvapic.raw -pc-bios/optionrom/kvmvapic.img -pc-bios/s390-ccw/s390-ccw.elf -pc-bios/s390-ccw/s390-ccw.img +/pc-bios/bios-pq/status +/pc-bios/vgabios-pq/status +/pc-bios/optionrom/linuxboot.asm +/pc-bios/optionrom/linuxboot.bin +/pc-bios/optionrom/linuxboot.raw +/pc-bios/optionrom/linuxboot.img +/pc-bios/optionrom/multiboot.asm +/pc-bios/optionrom/multiboot.bin +/pc-bios/optionrom/multiboot.raw +/pc-bios/optionrom/multiboot.img +/pc-bios/optionrom/kvmvapic.asm +/pc-bios/optionrom/kvmvapic.bin +/pc-bios/optionrom/kvmvapic.raw +/pc-bios/optionrom/kvmvapic.img +/pc-bios/s390-ccw/s390-ccw.elf +/pc-bios/s390-ccw/s390-ccw.img .stgit-* cscope.* tags diff --git a/.gitmodules b/.gitmodules index d7e3f3c..444c24a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,27 +1,30 @@ [submodule "roms/vgabios"] path = roms/vgabios - url = git://git.qemu.org/vgabios.git/ + url = git://git.qemu-project.org/vgabios.git/ [submodule "roms/seabios"] path = roms/seabios - url = git://git.qemu.org/seabios.git/ + url = git://git.qemu-project.org/seabios.git/ [submodule "roms/SLOF"] path = roms/SLOF - url = git://git.qemu.org/SLOF.git + url = git://git.qemu-project.org/SLOF.git [submodule "roms/ipxe"] path = roms/ipxe - url = git://git.qemu.org/ipxe.git + url = git://git.qemu-project.org/ipxe.git [submodule "roms/openbios"] path = roms/openbios - url = git://git.qemu.org/openbios.git + url = git://git.qemu-project.org/openbios.git +[submodule "roms/openhackware"] + path = roms/openhackware + url = git://git.qemu-project.org/openhackware.git [submodule "roms/qemu-palcode"] path = roms/qemu-palcode url = git://github.com/rth7680/qemu-palcode.git [submodule "roms/sgabios"] path = roms/sgabios - url = git://git.qemu.org/sgabios.git + url = git://git.qemu-project.org/sgabios.git [submodule "pixman"] path = pixman url = git://anongit.freedesktop.org/pixman [submodule "dtc"] path = dtc - url = git://git.qemu.org/dtc.git + url = git://git.qemu-project.org/dtc.git diff --git a/.mailmap b/.mailmap index 9797802..28defa1 100644 --- a/.mailmap +++ b/.mailmap @@ -2,7 +2,8 @@ # into proper addresses so that they are counted properly in git shortlog output. # Andrzej Zaborowski <balrogg@xxxxxxxxx> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> -Anthony Liguori <aliguori@xxxxxxxxxx> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> +Anthony Liguori <anthony@xxxxxxxxxxxxx> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> +Anthony Liguori <anthony@xxxxxxxxxxxxx> Anthony Liguori <aliguori@xxxxxxxxxx> Aurelien Jarno <aurelien@xxxxxxxxxxx> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> Blue Swirl <blauwirbel@xxxxxxxxx> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> Edgar E. Iglesias <edgar.iglesias@xxxxxxxxx> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..04da973 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,81 @@ +language: c +python: + - "2.4" +compiler: + - gcc + - clang +notifications: + irc: + channels: + - "irc.oftc.net#qemu" + on_success: change + on_failure: always +env: + global: + - TEST_CMD="make check" + - EXTRA_CONFIG="" + # Development packages, EXTRA_PKGS saved for additional builds + - CORE_PKGS="libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev" + - NET_PKGS="libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev libspice-protocol-dev libnss3-dev" + - GUI_PKGS="libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-dev" + - EXTRA_PKGS="" + matrix: + - TARGETS=alpha-softmmu,alpha-linux-user + - TARGETS=arm-softmmu,arm-linux-user + - TARGETS=aarch64-softmmu,aarch64-linux-user + - TARGETS=cris-softmmu + - TARGETS=i386-softmmu,x86_64-softmmu + - TARGETS=lm32-softmmu + - TARGETS=m68k-softmmu + - TARGETS=microblaze-softmmu,microblazeel-softmmu + - TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu + - TARGETS=moxie-softmmu + - TARGETS=or32-softmmu, + - TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu + - TARGETS=s390x-softmmu + - TARGETS=sh4-softmmu,sh4eb-softmmu + - TARGETS=sparc-softmmu,sparc64-softmmu + - TARGETS=unicore32-softmmu + - TARGETS=xtensa-softmmu,xtensaeb-softmmu +before_install: + - git submodule update --init --recursive + - sudo apt-get update -qq + - sudo apt-get install -qq ${CORE_PKGS} ${NET_PKGS} ${GUI_PKGS} ${EXTRA_PKGS} +script: "./configure --target-list=${TARGETS} ${EXTRA_CONFIG} && make && ${TEST_CMD}" +matrix: + # We manually include a number of additional build for non-standard bits + include: + # Debug related options + - env: TARGETS=i386-softmmu,x86_64-softmmu + EXTRA_CONFIG="--enable-debug" + compiler: gcc + - env: TARGETS=i386-softmmu,x86_64-softmmu + EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter" + compiler: gcc + # All the extra -dev packages + - env: TARGETS=i386-softmmu,x86_64-softmmu + EXTRA_PKGS="libaio-dev libcap-ng-dev libattr1-dev libbrlapi-dev uuid-dev libusb-1.0.0-dev" + compiler: gcc + # Currently configure doesn't force --disable-pie + - env: TARGETS=i386-softmmu,x86_64-softmmu + EXTRA_CONFIG="--enable-gprof --enable-gcov --disable-pie" + compiler: gcc + - env: TARGETS=i386-softmmu,x86_64-softmmu + EXTRA_PKGS="sparse" + EXTRA_CONFIG="--enable-sparse" + compiler: gcc + # All the trace backends (apart from dtrace) + - env: TARGETS=i386-softmmu,x86_64-softmmu + EXTRA_CONFIG="--enable-trace-backend=stderr" + compiler: gcc + - env: TARGETS=i386-softmmu,x86_64-softmmu + EXTRA_CONFIG="--enable-trace-backend=simple" + compiler: gcc + - env: TARGETS=i386-softmmu,x86_64-softmmu + EXTRA_CONFIG="--enable-trace-backend=ftrace" + TEST_CMD="" + compiler: gcc + - env: TARGETS=i386-softmmu,x86_64-softmmu + EXTRA_PKGS="liblttng-ust-dev liburcu-dev" + EXTRA_CONFIG="--enable-trace-backend=ust" + compiler: gcc diff --git a/CODING_STYLE b/CODING_STYLE index dcbce28..4280945 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -84,3 +84,10 @@ and clarity it comes on a line by itself: Rationale: a consistent (except for functions...) bracing style reduces ambiguity and avoids needless churn when lines are added or removed. Furthermore, it is the QEMU coding style. + +5. Declarations + +Mixed declarations (interleaving statements and declarations within blocks) +are not allowed; declarations should be at the beginning of blocks. In other +words, the code should not generate warnings if using GCC's +-Wdeclaration-after-statement option. diff --git a/Changelog b/Changelog index 13eebef..1249b8a 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,6 @@ This file documents changes for QEMU releases 0.12 and earlier. For changelog information for later releases, see -http://wiki.qemu.org/ChangeLog or look at the git history for +http://wiki.qemu-project.org/ChangeLog or look at the git history for more detailed information. diff --git a/MAINTAINERS b/MAINTAINERS index 654e2cb..c66946f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -50,8 +50,7 @@ Descriptions of section entries: General Project Administration ------------------------------ -M: Anthony Liguori <aliguori@xxxxxxxxxx> -M: Paul Brook <paul@xxxxxxxxxxxxxxxx> +M: Anthony Liguori <aliguori@xxxxxxxxxx> Guest CPU cores (TCG): ---------------------- @@ -62,7 +61,6 @@ F: target-alpha/ F: hw/alpha/ ARM -M: Paul Brook <paul@xxxxxxxxxxxxxxxx> M: Peter Maydell <peter.maydell@xxxxxxxxxx> S: Maintained F: target-arm/ @@ -83,8 +81,7 @@ F: hw/lm32/ F: hw/char/lm32_* M68K -M: Paul Brook <paul@xxxxxxxxxxxxxxxx> -S: Odd Fixes +S: Orphan F: target-m68k/ F: hw/m68k/ @@ -161,7 +158,6 @@ Guest CPU Cores (KVM): ---------------------- Overall -M: Gleb Natapov <gleb@xxxxxxxxxx> M: Paolo Bonzini <pbonzini@xxxxxxxxxx> L: kvm@xxxxxxxxxxxxxxx S: Supported @@ -179,12 +175,14 @@ S: Maintained F: target-ppc/kvm.c S390 +M: Christian Borntraeger <borntraeger@xxxxxxxxxx> +M: Cornelia Huck <cornelia.huck@xxxxxxxxxx> M: Alexander Graf <agraf@xxxxxxx> S: Maintained F: target-s390x/kvm.c +F: hw/intc/s390_flic.[hc] X86 -M: Gleb Natapov <gleb@xxxxxxxxxx> M: Marcelo Tosatti <mtosatti@xxxxxxxxxx> L: kvm@xxxxxxxxxxxxxxx S: Supported @@ -222,6 +220,13 @@ F: *win32* ARM Machines ------------ +Allwinner-a10 +M: Li Guang <lig.fnst@xxxxxxxxxxxxxx> +S: Maintained +F: hw/*/allwinner-a10* +F: include/hw/*/allwinner-a10* +F: hw/arm/cubieboard.c + Exynos M: Evgeny Voevodin <e.voevodin@xxxxxxxxxxx> M: Maksim Kozlov <m.kozlov@xxxxxxxxxxx> @@ -236,6 +241,12 @@ S: Supported F: hw/arm/highbank.c F: hw/net/xgmac.c +Canon DIGIC +M: Antony Pavlov <antonynpavlov@xxxxxxxxx> +S: Maintained +F: include/hw/arm/digic.h +F: hw/*/digic* + Gumstix M: qemu-devel@xxxxxxxxxx S: Orphan @@ -248,7 +259,6 @@ F: hw/*/imx* F: hw/arm/kzm.c Integrator CP -M: Paul Brook <paul@xxxxxxxxxxxxxxxx> M: Peter Maydell <peter.maydell@xxxxxxxxxx> S: Maintained F: hw/arm/integratorcp.c @@ -274,7 +284,6 @@ S: Maintained F: hw/arm/palm.c Real View -M: Paul Brook <paul@xxxxxxxxxxxxxxxx> M: Peter Maydell <peter.maydell@xxxxxxxxxx> S: Maintained F: hw/arm/realview* @@ -285,19 +294,17 @@ S: Maintained F: hw/arm/spitz.c Stellaris -M: Paul Brook <paul@xxxxxxxxxxxxxxxx> M: Peter Maydell <peter.maydell@xxxxxxxxxx> S: Maintained F: hw/*/stellaris* Versatile PB -M: Paul Brook <paul@xxxxxxxxxxxxxxxx> M: Peter Maydell <peter.maydell@xxxxxxxxxx> S: Maintained F: hw/*/versatile* Xilinx Zynq -M: Peter Crosthwaite <peter.crosthwaite@xxxxxxxxxxxxx> +M: Peter Crosthwaite <peter.crosthwaite@xxxxxxxxxx> S: Maintained F: hw/arm/xilinx_zynq.c F: hw/misc/zynq_slcr.c @@ -327,18 +334,15 @@ F: hw/lm32/milkymist.c M68K Machines ------------- an5206 -M: Paul Brook <paul@xxxxxxxxxxxxxxxx> -S: Maintained +S: Orphan F: hw/m68k/an5206.c dummy_m68k -M: Paul Brook <paul@xxxxxxxxxxxxxxxx> -S: Maintained +S: Orphan F: hw/m68k/dummy_m68k.c mcf5208 -M: Paul Brook <paul@xxxxxxxxxxxxxxxx> -S: Maintained +S: Orphan F: hw/m68k/mcf5208.c MicroBlaze Machines @@ -349,7 +353,7 @@ S: Maintained F: hw/microblaze/petalogix_s3adsp1800_mmu.c petalogix_ml605 -M: Peter Crosthwaite <peter.crosthwaite@xxxxxxxxxxxxx> +M: Peter Crosthwaite <peter.crosthwaite@xxxxxxxxxx> S: Maintained F: hw/microblaze/petalogix_ml605_mmu.c @@ -492,10 +496,13 @@ F: hw/s390x/s390-*.c S390 Virtio-ccw M: Cornelia Huck <cornelia.huck@xxxxxxxxxx> +M: Christian Borntraeger <borntraeger@xxxxxxxxxx> M: Alexander Graf <agraf@xxxxxxx> S: Supported F: hw/s390x/s390-virtio-ccw.c F: hw/s390x/css.[hc] +F: hw/s390x/sclp*.[hc] +F: hw/s390x/ipl*.[hc] T: git git://github.com/cohuck/qemu virtio-ccw-upstr UniCore32 Machines @@ -509,10 +516,24 @@ F: hw/unicore32/ X86 Machines ------------ PC -M: Anthony Liguori <aliguori@xxxxxxxxxx> +M: Anthony Liguori <aliguori@xxxxxxxxxx> +M: Michael S. Tsirkin <mst@xxxxxxxxxx> S: Supported -F: hw/i386/pc.[ch] -F: hw/i386/pc_piix.c +F: include/hw/i386/ +F: hw/i386/ +F: hw/pci-host/piix.c +F: hw/pci-host/q35.c +F: hw/pci-host/pam.c +F: include/hw/pci-host/q35.h +F: include/hw/pci-host/pam.h +F: hw/isa/piix4.c +F: hw/isa/lpc_ich9.c +F: hw/i2c/smbus_ich9.c +F: hw/acpi/piix4.c +F: hw/acpi/ich9.c +F: include/hw/acpi/ich9.h +F: include/hw/acpi/piix.h + Xtensa Machines --------------- @@ -567,12 +588,11 @@ F: hw/scsi/* T: git git://github.com/bonzini/qemu.git scsi-next LSI53C895A -M: Paul Brook <paul@xxxxxxxxxxxxxxxx> -S: Odd Fixes +S: Orphan F: hw/scsi/lsi53c895a.c SSI -M: Peter Crosthwaite <peter.crosthwaite@xxxxxxxxxxxxx> +M: Peter Crosthwaite <peter.crosthwaite@xxxxxxxxxx> S: Maintained F: hw/ssi/* F: hw/block/m25p80.c @@ -593,7 +613,8 @@ S: Supported F: hw/*/*vhost* virtio -M: Anthony Liguori <aliguori@xxxxxxxxxx> +M: Anthony Liguori <aliguori@xxxxxxxxxx> +M: Michael S. Tsirkin <mst@xxxxxxxxxx> S: Supported F: hw/*/virtio* @@ -602,6 +623,7 @@ M: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> S: Supported F: hw/9pfs/ F: fsdev/ +F: tests/virtio-9p-test.c T: git git://github.com/kvaneesh/QEMU.git virtio-blk @@ -612,6 +634,7 @@ F: hw/block/virtio-blk.c virtio-ccw M: Cornelia Huck <cornelia.huck@xxxxxxxxxx> +M: Christian Borntraeger <borntraeger@xxxxxxxxxx> S: Supported F: hw/s390x/virtio-ccw.[hc] T: git git://github.com/cohuck/qemu virtio-ccw-upstr @@ -626,9 +649,10 @@ nvme M: Keith Busch <keith.busch@xxxxxxxxx> S: Supported F: hw/block/nvme* +F: tests/nvme-test.c Xilinx EDK -M: Peter Crosthwaite <peter.crosthwaite@xxxxxxxxxxxxx> +M: Peter Crosthwaite <peter.crosthwaite@xxxxxxxxxx> M: Edgar E. Iglesias <edgar.iglesias@xxxxxxxxx> S: Maintained F: hw/*/xilinx_* @@ -638,6 +662,7 @@ Subsystems ---------- Audio M: Vassili Karpov (malc) <av1474@xxxxxxxx> +M: Gerd Hoffmann <kraxel@xxxxxxxxxx> S: Maintained F: audio/ F: hw/audio/ @@ -649,9 +674,11 @@ S: Supported F: block* F: block/ F: hw/block/ +T: git git://repo.or.cz/qemu/kevin.git block +T: git git://github.com/stefanha/qemu.git block Character Devices -M: Anthony Liguori <aliguori@xxxxxxxxxx> +M: Anthony Liguori <aliguori@xxxxxxxxxx> S: Maintained F: qemu-char.c @@ -669,7 +696,7 @@ F: include/hw/cpu/icc_bus.h F: hw/cpu/icc_bus.c Device Tree -M: Peter Crosthwaite <peter.crosthwaite@xxxxxxxxxxxxx> +M: Peter Crosthwaite <peter.crosthwaite@xxxxxxxxxx> M: Alexander Graf <agraf@xxxxxxx> S: Maintained F: device_tree.[ch] @@ -689,34 +716,45 @@ F: audio/spiceaudio.c F: hw/display/qxl* Graphics -M: Anthony Liguori <aliguori@xxxxxxxxxx> -S: Maintained +M: Anthony Liguori <aliguori@xxxxxxxxxx> +M: Gerd Hoffmann <kraxel@xxxxxxxxxx> +S: Odd Fixes F: ui/ Cocoa graphics M: Andreas Färber <andreas.faerber@xxxxxx> +M: Peter Maydell <peter.maydell@xxxxxxxxxx> S: Odd Fixes F: ui/cocoa.m Main loop -M: Anthony Liguori <aliguori@xxxxxxxxxx> +M: Anthony Liguori <aliguori@xxxxxxxxxx> S: Supported F: vl.c Human Monitor (HMP) M: Luiz Capitulino <lcapitulino@xxxxxxxxxx> -S: Supported +S: Maintained F: monitor.c F: hmp.c F: hmp-commands.hx +T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp Network device layer -M: Anthony Liguori <aliguori@xxxxxxxxxx> +M: Anthony Liguori <aliguori@xxxxxxxxxx> M: Stefan Hajnoczi <stefanha@xxxxxxxxxx> S: Maintained F: net/ T: git git://github.com/stefanha/qemu.git net +Netmap network backend +M: Luigi Rizzo <rizzo@xxxxxxxxxxxx> +M: Giuseppe Lettieri <g.lettieri@xxxxxxxxxxxx> +M: Vincenzo Maffione <v.maffione@xxxxxxxxx> +W: http://info.iet.unipi.it/~luigi/netmap/ +S: Maintained +F: net/netmap.c + Network Block Device (NBD) M: Paolo Bonzini <pbonzini@xxxxxxxxxx> S: Odd Fixes @@ -728,8 +766,9 @@ T: git git://github.com/bonzini/qemu.git nbd-next QAPI M: Luiz Capitulino <lcapitulino@xxxxxxxxxx> M: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx> -S: Supported +S: Maintained F: qapi/ +T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp QAPI Schema M: Eric Blake <eblake@xxxxxxxxxx> @@ -737,14 +776,16 @@ M: Luiz Capitulino <lcapitulino@xxxxxxxxxx> M: Markus Armbruster <armbru@xxxxxxxxxx> S: Supported F: qapi-schema.json +T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp QMP M: Luiz Capitulino <lcapitulino@xxxxxxxxxx> -S: Supported +S: Maintained F: qmp.c F: monitor.c F: qmp-commands.hx F: QMP/ +T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp SLIRP M: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> @@ -766,6 +807,12 @@ M: Blue Swirl <blauwirbel@xxxxxxxxx> S: Odd Fixes F: scripts/checkpatch.pl +Seccomp +M: Eduardo Otubo <otubo@xxxxxxxxxxxxxxxxxx> +S: Supported +F: qemu-seccomp.c +F: include/sysemu/seccomp.h + Usermode Emulation ------------------ BSD user @@ -797,11 +844,6 @@ M: Andrzej Zaborowski <balrogg@xxxxxxxxx> S: Maintained F: tcg/arm/ -HPPA target -M: Richard Henderson <rth@xxxxxxxxxxx> -S: Maintained -F: tcg/hppa/ - i386 target M: qemu-devel@xxxxxxxxxx S: Maintained @@ -842,25 +884,73 @@ TCI target M: Stefan Weil <sw@xxxxxxxxxxx> S: Maintained F: tcg/tci/ +F: tci.c Stable branches --------------- Stable 1.0 L: qemu-stable@xxxxxxxxxx -T: git git://git.qemu.org/qemu-stable-1.0.git +T: git git://git.qemu-project.org/qemu-stable-1.0.git S: Orphan Stable 0.15 L: qemu-stable@xxxxxxxxxx -T: git git://git.qemu.org/qemu-stable-0.15.git -S: Orphan +M: Andreas Färber <afaerber@xxxxxxx> +T: git git://git.qemu-project.org/qemu-stable-0.15.git +S: Supported Stable 0.14 L: qemu-stable@xxxxxxxxxx -T: git git://git.qemu.org/qemu-stable-0.14.git +T: git git://git.qemu-project.org/qemu-stable-0.14.git S: Orphan Stable 0.10 L: qemu-stable@xxxxxxxxxx -T: git git://git.qemu.org/qemu-stable-0.10.git +T: git git://git.qemu-project.org/qemu-stable-0.10.git S: Orphan + +Block drivers +------------- +VMDK +M: Fam Zheng <famz@xxxxxxxxxx> +S: Supported +F: block/vmdk.c + +RBD +M: Josh Durgin <josh.durgin@xxxxxxxxxxx> +S: Supported +F: block/rbd.c + +Sheepdog +M: MORITA Kazutaka <morita.kazutaka@xxxxxxxxxxxxx> +M: Liu Yuan <namei.unix@xxxxxxxxx> +L: sheepdog@xxxxxxxxxxxxxx +S: Supported +F: block/sheepdog.c + +VHDX +M: Jeff Cody <jcody@xxxxxxxxxx> +S: Supported +F: block/vhdx* + +VDI +M: Stefan Weil <sw@xxxxxxxxxxx> +S: Maintained +F: block/vdi.c + +iSCSI +M: Ronnie Sahlberg <ronniesahlberg@xxxxxxxxx> +M: Paolo Bonzini <pbonzini@xxxxxxxxxx> +M: Peter Lieven <pl@xxxxxxx> +S: Supported +F: block/iscsi.c + +NFS +M: Peter Lieven <pl@xxxxxxx> +S: Maintained +F: block/nfs.c + +SSH +M: Richard W.M. Jones <rjones@xxxxxxxxxx> +S: Supported +F: block/ssh.c diff --git a/Makefile b/Makefile index 4d257f1..423e373 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,14 @@ CONFIG_ALL=y include $(SRC_PATH)/rules.mak config-host.mak: $(SRC_PATH)/configure @echo $@ is out-of-date, running configure - @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh + @# TODO: The next lines include code which supports a smooth + @# transition from old configurations without config.status. + @# This code can be removed after QEMU 1.7. + @if test -x config.status; then \ + ./config.status; \ + else \ + sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh; \ + fi else config-host.mak: ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail)) @@ -50,6 +57,11 @@ GENERATED_HEADERS += trace/generated-tracers-dtrace.h endif GENERATED_SOURCES += trace/generated-tracers.c +ifeq ($(TRACE_BACKEND),ust) +GENERATED_HEADERS += trace/generated-ust-provider.h +GENERATED_SOURCES += trace/generated-ust.c +endif + # Don't try to regenerate Makefile or configure # We don't generate any of them Makefile: ; @@ -65,7 +77,7 @@ LIBS+=-lz $(LIBS_TOOLS) HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) ifdef BUILD_DOCS -DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt +DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qmp-commands.txt ifdef CONFIG_VIRTFS DOCS+=fsdev/virtfs-proxy-helper.1 endif @@ -115,13 +127,30 @@ defconfig: ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs +endif + +dummy := $(call unnest-vars,, \ + stub-obj-y \ + util-obj-y \ + qga-obj-y \ + qga-vss-dll-obj-y \ + block-obj-y \ + block-obj-m \ + common-obj-y \ + common-obj-m) + +ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/tests/Makefile endif ifeq ($(CONFIG_SMARTCARD_NSS),y) include $(SRC_PATH)/libcacard/Makefile endif -all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all +all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules + +vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) + +vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak @@ -131,6 +160,7 @@ qemu-options.def: $(SRC_PATH)/qemu-options.hx SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) +$(SOFTMMU_SUBDIR_RULES): $(block-obj-y) $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak subdir-%: @@ -168,7 +198,9 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo + $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.o") $(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h + $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.lo") Makefile: $(version-obj-y) $(version-lobj-y) @@ -178,6 +210,9 @@ Makefile: $(version-obj-y) $(version-lobj-y) libqemustub.a: $(stub-obj-y) libqemuutil.a: $(util-obj-y) qapi-types.o qapi-visit.o +block-modules = $(foreach o,$(block-obj-m),"$(basename $(subst /,-,$o))",) NULL +util/module.o-cflags = -D'CONFIG_BLOCK_MODULES=$(block-modules)' + ###################################################################### qemu-img.o: qemu-img-cmds.h @@ -231,10 +266,10 @@ clean: # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h rm -f qemu-options.def - find . -name '*.[oda]' -type f -exec rm -f {} + - find . -name '*.l[oa]' -type f -exec rm -f {} + - rm -f $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ - rm -Rf .libs + find . \( -name '*.l[oa]' -o -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f -exec rm {} + + rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ + rm -f fsdev/*.pod + rm -rf .libs */.libs rm -f qemu-img-cmds.h @# May not be present in GENERATED_HEADERS rm -f trace/generated-tracers-dtrace.dtrace* @@ -243,7 +278,6 @@ clean: rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp) rm -rf qapi-generated rm -rf qga/qapi-generated - $(MAKE) -C tests/tcg clean for d in $(ALL_SUBDIRS); do \ if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ rm -f $$d/qemu-options.def; \ @@ -259,6 +293,7 @@ qemu-%.tar.bz2: distclean: clean rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi rm -f config-all-devices.mak config-all-disas.mak + rm -f po/*.mo rm -f roms/seabios/config.mak roms/vgabios/config.mak rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps qemu-doc.dvi rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys @@ -270,19 +305,20 @@ distclean: clean for d in $(TARGET_DIRS); do \ rm -rf $$d || exit 1 ; \ done + rm -Rf .sdk if test -f pixman/config.log; then make -C pixman distclean; fi if test -f dtc/version_gen.h; then make $(DTC_MAKE_ARGS) clean; fi KEYMAPS=da en-gb et fr fr-ch is lt modifiers no pt-br sv \ ar de en-us fi fr-be hr it lv nl pl ru th \ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr \ -bepo +bepo cz ifdef INSTALL_BLOBS -BLOBS=bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ +BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \ acpi-dsdt.aml q35-acpi-dsdt.aml \ -ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \ +ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \ @@ -301,7 +337,7 @@ endif install-doc: $(DOCS) $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) QMP/qmp-commands.txt "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) qmp-commands.txt "$(DESTDIR)$(qemu_docdir)" ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" @@ -338,6 +374,12 @@ install-datadir install-localstatedir ifneq ($(TOOLS),) $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" endif +ifneq ($(CONFIG_MODULES),) + $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)" + for s in $(patsubst %.mo,%$(DSOSUF),$(modules-m)); do \ + $(INSTALL_PROG) $(STRIP_OPT) $$s "$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \ + done +endif ifneq ($(HELPERS-y),) $(INSTALL_DIR) "$(DESTDIR)$(libexecdir)" $(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)" @@ -355,7 +397,7 @@ endif $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ done for d in $(TARGET_DIRS); do \ - $(MAKE) -C $$d $@ || exit 1 ; \ + $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ done # various test targets @@ -395,7 +437,7 @@ qemu-options.texi: $(SRC_PATH)/qemu-options.hx qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") -QMP/qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx +qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@," GEN $@") qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx diff --git a/Makefile.objs b/Makefile.objs index f46a4cd..a6e0e2a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -19,11 +19,8 @@ block-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o block-obj-y += qemu-coroutine-sleep.o block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o -ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) -# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. -# only pull in the actual virtio-9p device if we also enabled virtio. -CONFIG_REALLY_VIRTFS=y -endif +block-obj-m = block/ + ###################################################################### # smartcard @@ -41,9 +38,9 @@ libcacard-y += libcacard/vcardt.o # single QEMU executable should support all CPUs and machines. ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/ +common-obj-y = blockdev.o blockdev-nbd.o block/ +common-obj-y += iothread.o common-obj-y += net/ -common-obj-y += readline.o common-obj-y += qdev-monitor.o device-hotplug.o common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o @@ -51,6 +48,8 @@ common-obj-$(CONFIG_POSIX) += os-posix.o common-obj-$(CONFIG_LINUX) += fsdev/ common-obj-y += migration.o migration-tcp.o +common-obj-y += vmstate.o +common-obj-y += qemu-file.o common-obj-$(CONFIG_RDMA) += migration-rdma.o common-obj-y += qemu-char.o #aio.o common-obj-y += block-migration.o @@ -109,17 +108,4 @@ version-lobj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.lo # FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed # by libqemuutil.a. These should be moved to a separate .json schema. qga-obj-y = qga/ qapi-types.o qapi-visit.o - -vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) - -vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) - -QEMU_CFLAGS+=$(GLIB_CFLAGS) - -nested-vars += \ - stub-obj-y \ - util-obj-y \ - qga-obj-y \ - block-obj-y \ - common-obj-y -dummy := $(call unnest-vars) +qga-vss-dll-obj-y = qga/ diff --git a/Makefile.target b/Makefile.target index 9a49852..6d8fde8 100644 --- a/Makefile.target +++ b/Makefile.target @@ -70,10 +70,6 @@ all: $(PROGS) stap # Dummy command so that make thinks it has done something @true -CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y) -CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y) -CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y) - ######################################################### # cpu emulator library obj-y = exec.o translate-all.o cpu-exec.o @@ -83,8 +79,8 @@ obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o obj-y += fpu/softfloat.o obj-y += target-$(TARGET_BASE_ARCH)/ obj-y += disas.o -obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o -obj-$(CONFIG_NO_KVM) += kvm-stub.o +obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o +obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o ######################################################### # Linux user emulator target @@ -124,8 +120,10 @@ obj-y += dump.o LIBS+=$(libs_softmmu) # xen support -obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o -obj-$(CONFIG_NO_XEN) += xen-stub.o +obj-$(CONFIG_XEN) += xen-common.o +obj-$(CONFIG_XEN_I386) += xen-hvm.o xen-mapcache.o +obj-$(call lnot,$(CONFIG_XEN)) += xen-common-stub.o +obj-$(call lnot,$(CONFIG_XEN_I386)) += xen-hvm-stub.o # Hardware support ifeq ($(TARGET_NAME), sparc64) @@ -134,8 +132,6 @@ else obj-y += hw/$(TARGET_BASE_ARCH)/ endif -main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) - GENERATED_HEADERS += hmp-commands.h qmp-commands-old.h endif # CONFIG_SOFTMMU @@ -143,13 +139,26 @@ endif # CONFIG_SOFTMMU # Workaround for http://gcc.gnu.org/PR55489, see configure. %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS) -nested-vars += obj-y +dummy := $(call unnest-vars,,obj-y) -# This resolves all nested paths, so it must come last +# we are making another call to unnest-vars with different vars, protect obj-y, +# it can be overriden in subdir Makefile.objs +obj-y-save := $(obj-y) + +block-obj-y := +common-obj-y := include $(SRC_PATH)/Makefile.objs +dummy := $(call unnest-vars,.., \ + block-obj-y \ + block-obj-m \ + common-obj-y \ + common-obj-m) + +# Now restore obj-y +obj-y := $(obj-y-save) -all-obj-y = $(obj-y) -all-obj-y += $(addprefix ../, $(common-obj-y)) +all-obj-y = $(obj-y) $(common-obj-y) +all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) ifndef CONFIG_HAIKU LIBS+=-lm diff --git a/QMP/README b/QMP/README deleted file mode 100644 index c95a08c..0000000 --- a/QMP/README +++ /dev/null @@ -1,88 +0,0 @@ - QEMU Monitor Protocol - ===================== - -Introduction -------------- - -The QEMU Monitor Protocol (QMP) allows applications to communicate with -QEMU's Monitor. - -QMP is JSON[1] based and currently has the following features: - -- Lightweight, text-based, easy to parse data format -- Asynchronous messages support (ie. events) -- Capabilities Negotiation - -For detailed information on QMP's usage, please, refer to the following files: - -o qmp-spec.txt QEMU Monitor Protocol current specification -o qmp-commands.txt QMP supported commands (auto-generated at build-time) -o qmp-events.txt List of available asynchronous events - -There is also a simple Python script called 'qmp-shell' available. - -IMPORTANT: It's strongly recommended to read the 'Stability Considerations' -section in the qmp-commands.txt file before making any serious use of QMP. - - -[1] http://www.json.org - -Usage ------ - -To enable QMP, you need a QEMU monitor instance in "control mode". There are -two ways of doing this. - -The simplest one is using the '-qmp' command-line option. The following -example makes QMP available on localhost port 4444: - - $ qemu [...] -qmp tcp:localhost:4444,server - -However, in order to have more complex combinations, like multiple monitors, -the '-mon' command-line option should be used along with the '-chardev' one. -For instance, the following example creates one user monitor on stdio and one -QMP monitor on localhost port 4444. - - $ qemu [...] -chardev stdio,id=mon0 -mon chardev=mon0,mode=readline \ - -chardev socket,id=mon1,host=localhost,port=4444,server \ - -mon chardev=mon1,mode=control - -Please, refer to QEMU's manpage for more information. - -Simple Testing --------------- - -To manually test QMP one can connect with telnet and issue commands by hand: - -$ telnet localhost 4444 -Trying 127.0.0.1... -Connected to localhost. -Escape character is '^]'. -{"QMP": {"version": {"qemu": {"micro": 50, "minor": 13, "major": 0}, "package": ""}, "capabilities": []}} -{ "execute": "qmp_capabilities" } -{"return": {}} -{ "execute": "query-version" } -{"return": {"qemu": {"micro": 50, "minor": 13, "major": 0}, "package": ""}} - -Development Process -------------------- - -When changing QMP's interface (by adding new commands, events or modifying -existing ones) it's mandatory to update the relevant documentation, which is -one (or more) of the files listed in the 'Introduction' section*. - -Also, it's strongly recommended to send the documentation patch first, before -doing any code change. This is so because: - - 1. Avoids the code dictating the interface - - 2. Review can improve your interface. Letting that happen before - you implement it can save you work. - -* The qmp-commands.txt file is generated from the qmp-commands.hx one, which - is the file that should be edited. - -Homepage --------- - -http://wiki.qemu.org/QMP diff --git a/QMP/qemu-ga-client b/QMP/qemu-ga-client deleted file mode 100755 index 46676c3..0000000 --- a/QMP/qemu-ga-client +++ /dev/null @@ -1,299 +0,0 @@ -#!/usr/bin/python - _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |