|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [qemu-xen master] Merge remote-tracking branch 'qemu-xen/staging' into qemu-xen-4.7
=== This changeset includes merge from high-traffic branch ===
Commits on that branch are not reported individually.
commit 3fb401edbd8e9741c611bfddf6a2032ca91f55ed
Merge: a44c2800d990252b3632bbb35af34ec5ff99e2f1
816609b2841297925a223ec377c336360e044ee5
Author: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
AuthorDate: Mon Nov 23 16:55:36 2015 +0000
Commit: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
CommitDate: Mon Nov 23 16:55:36 2015 +0000
Merge remote-tracking branch 'qemu-xen/staging' into qemu-xen-4.7
.gitignore | 12 +-
.travis.yml | 3 +
LICENSE | 2 +-
MAINTAINERS | 322 +-
Makefile | 114 +-
Makefile.objs | 14 +-
Makefile.target | 18 +-
VERSION | 2 +-
aio-posix.c | 109 +-
aio-win32.c | 60 +-
arch_init.c | 1118 ---
async.c | 105 +-
audio/Makefile.objs | 4 -
audio/alsaaudio.c | 195 +-
audio/audio.c | 35 +-
audio/audio_int.h | 7 +-
audio/audio_template.h | 43 +-
audio/coreaudio.c | 46 +-
audio/dsound_template.h | 51 +-
audio/dsoundaudio.c | 238 +-
audio/esdaudio.c | 557 --
audio/fmodaudio.c | 685 --
audio/noaudio.c | 4 +-
audio/ossaudio.c | 141 +-
audio/paaudio.c | 105 +-
audio/sdlaudio.c | 10 +-
audio/spiceaudio.c | 6 +-
audio/wavaudio.c | 42 +-
audio/wavcapture.c | 1 +
audio/winwaveaudio.c | 717 --
backends/hostmem-file.c | 2 +-
backends/hostmem.c | 45 +-
backends/rng-egd.c | 11 +-
backends/rng-random.c | 12 +-
backends/rng.c | 2 +-
backends/tpm.c | 29 +-
balloon.c | 65 +-
block-migration.c | 892 --
block.c | 3465 ++------
block/Makefile.objs | 10 +-
block/accounting.c | 13 +-
block/archipelago.c | 6 +-
block/backup.c | 188 +-
block/blkdebug.c | 125 +-
block/blkverify.c | 4 +-
block/block-backend.c | 303 +-
block/commit.c | 3 +-
block/curl.c | 16 +-
block/dmg.c | 503 +-
block/io.c | 2610 ++++++
block/iscsi.c | 204 +-
block/linux-aio.c | 99 +-
block/mirror.c | 145 +-
block/nbd-client.c | 129 +-
block/nbd-client.h | 35 +-
block/nbd.c | 50 +-
block/nfs.c | 9 +-
block/null.c | 66 +-
block/parallels.c | 679 ++-
block/qapi.c | 116 +-
block/qcow.c | 121 +-
block/qcow2-cache.c | 172 +-
block/qcow2-cluster.c | 169 +-
block/qcow2-refcount.c | 675 +-
block/qcow2-snapshot.c | 9 +-
block/qcow2.c | 281 +-
block/qcow2.h | 67 +-
block/qed.c | 13 +-
block/qed.h | 1 -
block/quorum.c | 102 +-
block/raw-aio.h | 2 +-
block/raw-posix.c | 454 +-
block/raw-win32.c | 3 +-
block/raw_bsd.c | 76 +-
block/rbd.c | 74 +-
block/sheepdog.c | 363 +-
block/snapshot.c | 19 +-
block/ssh.c | 4 +-
block/stream.c | 5 +-
block/throttle-groups.c | 501 ++
block/vdi.c | 36 +-
block/vhdx-log.c | 1 +
block/vhdx.c | 41 +-
block/vhdx.h | 3 +-
block/vmdk.c | 227 +-
block/vpc.c | 165 +-
block/vvfat.c | 46 +-
block/write-threshold.c | 125 +
blockdev-nbd.c | 34 +-
blockdev.c | 878 ++-
blockjob.c | 52 +-
bootdevice.c | 113 +-
bsd-user/elfload.c | 11 +-
bsd-user/main.c | 19 +-
configure | 793 ++-
coroutine-ucontext.c | 69 +-
cpu-exec.c | 98 +-
cpus.c | 206 +-
cputlb.c | 45 +-
crypto/Makefile.objs | 5 +
crypto/aes.c | 1652 ++++
crypto/cipher-builtin.c | 400 +
crypto/cipher-gcrypt.c | 195 +
crypto/cipher-nettle.c | 245 +
crypto/cipher.c | 74 +
crypto/desrfb.c | 415 +
crypto/hash.c | 200 +
crypto/init.c | 150 +
default-configs/aarch64-softmmu.mak | 2 +-
default-configs/alpha-softmmu.mak | 2 -
default-configs/arm-softmmu.mak | 14 +
default-configs/i386-softmmu.mak | 10 +-
default-configs/lm32-softmmu.mak | 2 +-
default-configs/microblazeel-softmmu.mak | 10 +-
default-configs/mips-softmmu.mak | 10 +-
default-configs/mips64-softmmu.mak | 6 +-
default-configs/mips64el-softmmu.mak | 6 +-
default-configs/mipsel-softmmu.mak | 10 +-
default-configs/pci.mak | 7 +
default-configs/ppc-softmmu.mak | 4 +-
default-configs/ppc64-softmmu.mak | 10 +-
default-configs/ppcemb-softmmu.mak | 3 -
default-configs/s390x-softmmu.mak | 3 +
default-configs/sparc64-softmmu.mak | 2 -
default-configs/usb.mak | 1 +
default-configs/x86_64-softmmu.mak | 11 +-
device-hotplug.c | 9 +-
device_tree.c | 22 +-
disas.c | 133 +-
disas/arm-a64.cc | 31 +-
disas/arm.c | 128 -
disas/cris.c | 19 +-
disas/libvixl/README | 2 +-
disas/libvixl/a64/assembler-a64.h | 290 +-
disas/libvixl/a64/constants-a64.h | 61 +-
disas/libvixl/a64/decoder-a64.h | 2 +-
disas/libvixl/a64/disasm-a64.cc | 142 +-
disas/libvixl/a64/disasm-a64.h | 48 +-
disas/libvixl/a64/instructions-a64.cc | 63 +
disas/libvixl/a64/instructions-a64.h | 110 +-
disas/libvixl/globals.h | 2 +-
disas/libvixl/utils.cc | 13 +
disas/libvixl/utils.h | 14 +-
disas/microblaze.c | 13 +-
disas/mips.c | 25 +-
disas/s390.c | 35 -
disas/sh4.c | 2 +-
disas/sparc.c | 32 -
disas/tci.c | 1 +
dma-helpers.c | 21 +-
docs/aio_notify.promela | 77 +-
docs/aio_notify_accept.promela | 152 +
docs/aio_notify_bug.promela | 140 +
docs/atomics.txt | 4 +-
docs/bitmaps.md | 352 +
docs/memory-hotplug.txt | 93 +
docs/memory.txt | 74 +-
docs/migration.txt | 11 +-
docs/multi-thread-compression.txt | 149 +
docs/multiseat.txt | 55 +-
docs/pci_expander_bridge.txt | 58 +
docs/qapi-code-gen.txt | 497 +-
docs/qmp/qmp-events.txt | 53 +-
docs/qmp/qmp-spec.txt | 115 +-
docs/rcu.txt | 390 +
docs/specs/acpi_mem_hotplug.txt | 58 +-
docs/specs/edu.txt | 110 +
docs/specs/fw_cfg.txt | 226 +
docs/specs/pci-ids.txt | 4 +
docs/specs/ppc-spapr-hotplug.txt | 305 +
docs/specs/rocker.txt | 1014 +++
docs/writing-qmp-commands.txt | 2 +-
docs/xbzrle.txt | 8 +
dtc | 2 +-
dump.c | 13 +-
exec.c | 1328 +++-
fpu/softfloat-macros.h | 86 +-
fpu/softfloat-specialize.h | 267 +-
fpu/softfloat.c | 1787 +++--
fsdev/virtfs-proxy-helper.c | 25 +-
gdb-xml/s390-vx.xml | 59 +
gdbstub.c | 64 +-
hmp-commands.hx | 258 +-
hmp.c | 836 ++-
hmp.h | 20 +-
hw/9pfs/virtio-9p-coth.c | 29 +-
hw/9pfs/virtio-9p-coth.h | 4 +-
hw/9pfs/virtio-9p-device.c | 8 +-
hw/9pfs/virtio-9p-handle.c | 4 +-
hw/9pfs/virtio-9p-local.c | 57 +-
hw/9pfs/virtio-9p-posix-acl.c | 2 +-
hw/9pfs/virtio-9p-proxy.c | 26 +-
hw/9pfs/virtio-9p-synth.c | 3 +-
hw/9pfs/virtio-9p.c | 27 +-
hw/9pfs/virtio-9p.h | 22 +-
hw/Makefile.objs | 1 +
hw/acpi/Makefile.objs | 8 +-
hw/acpi/aml-build.c | 1217 +++
hw/acpi/bios-linker-loader.c | 159 +
hw/acpi/core.c | 23 +-
hw/acpi/cpu_hotplug.c | 3 +-
hw/acpi/ich9.c | 199 +-
hw/acpi/memory_hotplug.c | 101 +-
hw/acpi/pcihp.c | 28 +-
hw/acpi/piix4.c | 64 +-
hw/acpi/tco.c | 264 +
hw/alpha/dp264.c | 22 +-
hw/alpha/typhoon.c | 18 +-
hw/arm/Makefile.objs | 5 +
hw/arm/allwinner-a10.c | 8 +
hw/arm/armv7m.c | 39 +-
hw/arm/boot.c | 208 +-
hw/arm/cubieboard.c | 5 +-
hw/arm/digic.c | 6 +
hw/arm/digic_boards.c | 10 +-
hw/arm/exynos4210.c | 13 +-
hw/arm/highbank.c | 35 +-
hw/arm/integratorcp.c | 130 +-
hw/arm/kzm.c | 3 +-
hw/arm/musicpal.c | 11 +-
hw/arm/netduino2.c | 57 +
hw/arm/nseries.c | 16 +-
hw/arm/omap1.c | 78 +-
hw/arm/omap2.c | 18 +-
hw/arm/omap_sx1.c | 2 +-
hw/arm/pxa2xx.c | 260 +-
hw/arm/pxa2xx_gpio.c | 2 +-
hw/arm/pxa2xx_pic.c | 2 +-
hw/arm/realview.c | 21 +-
hw/arm/spitz.c | 3 +
hw/arm/stellaris.c | 29 +-
hw/arm/stm32f205_soc.c | 160 +
hw/arm/strongarm.c | 11 +-
hw/arm/sysbus-fdt.c | 247 +
hw/arm/versatilepb.c | 39 +-
hw/arm/vexpress.c | 176 +-
hw/arm/virt-acpi-build.c | 697 ++
hw/arm/virt.c | 489 +-
hw/arm/xilinx_zynq.c | 23 +-
hw/arm/xlnx-ep108.c | 82 +
hw/arm/xlnx-zynqmp.c | 272 +
hw/audio/ac97.c | 5 +-
hw/audio/es1370.c | 5 +-
hw/audio/gus.c | 20 +-
hw/audio/intel-hda.c | 6 +-
hw/audio/pcspk.c | 2 +-
hw/audio/sb16.c | 7 -
hw/block/block.c | 24 +
hw/block/dataplane/virtio-blk.c | 24 +-
hw/block/fdc.c | 351 +-
hw/block/hd-geometry.c | 10 +-
hw/block/m25p80.c | 6 +-
hw/block/nand.c | 2 +-
hw/block/nvme.c | 51 +-
hw/block/nvme.h | 3 +-
hw/block/onenand.c | 8 +-
hw/block/pflash_cfi01.c | 208 +-
hw/block/pflash_cfi02.c | 5 +-
hw/block/virtio-blk.c | 522 +-
hw/block/xen_disk.c | 27 +-
hw/bt/sdp.c | 2 +-
hw/char/Makefile.objs | 1 +
hw/char/cadence_uart.c | 142 +-
hw/char/digic-uart.c | 3 +
hw/char/etraxfs_ser.c | 3 +
hw/char/lm32_juart.c | 3 +
hw/char/lm32_uart.c | 3 +
hw/char/milkymist-uart.c | 3 +
hw/char/omap_uart.c | 3 +-
hw/char/pl011.c | 3 +
hw/char/sclpconsole-lm.c | 1 +
hw/char/sclpconsole.c | 1 +
hw/char/serial-isa.c | 23 +-
hw/char/serial-pci.c | 43 +-
hw/char/serial.c | 119 +-
hw/char/spapr_vty.c | 22 +-
hw/char/stm32f2xx_usart.c | 232 +
hw/char/virtio-console.c | 10 +
hw/char/virtio-serial-bus.c | 108 +-
hw/char/xilinx_uartlite.c | 3 +
hw/core/Makefile.objs | 2 +-
hw/core/fw-path-provider.c | 2 +-
hw/core/loader.c | 70 +-
hw/core/machine.c | 132 +-
hw/core/nmi.c | 22 +-
hw/core/platform-bus.c | 1 -
hw/core/ptimer.c | 4 +-
hw/core/qdev-properties-system.c | 155 +-
hw/core/qdev-properties.c | 95 +-
hw/core/qdev.c | 95 +-
hw/core/sysbus.c | 35 +-
hw/cris/axis_dev88.c | 5 +-
hw/display/Makefile.objs | 7 +-
hw/display/blizzard.c | 1 -
hw/display/cg3.c | 7 +-
hw/display/cirrus_vga.c | 61 +-
hw/display/exynos4210_fimd.c | 22 +-
hw/display/framebuffer.c | 73 +-
hw/display/framebuffer.h | 44 +-
hw/display/g364fb.c | 4 +-
hw/display/milkymist-vgafb.c | 15 +-
hw/display/omap_dss.c | 15 +-
hw/display/omap_lcdc.c | 12 +-
hw/display/pl110.c | 13 +-
hw/display/pxa2xx_lcd.c | 29 +-
hw/display/qxl-logger.c | 16 +-
hw/display/qxl-render.c | 2 +
hw/display/qxl.c | 162 +-
hw/display/qxl.h | 6 +
hw/display/sm501.c | 2 +
hw/display/tc6393xb.c | 4 +-
hw/display/tcx.c | 7 +-
hw/display/vga-isa.c | 2 +-
hw/display/vga-pci.c | 178 +-
hw/display/vga.c | 71 +-
hw/display/vga_int.h | 9 +
hw/display/virtio-gpu-pci.c | 76 +
hw/display/virtio-gpu.c | 919 ++
hw/display/virtio-vga.c | 182 +
hw/display/vmware_vga.c | 8 +-
hw/display/xenfb.c | 5 +
hw/dma/omap_dma.c | 8 +-
hw/dma/pl080.c | 20 +-
hw/dma/pl330.c | 6 +-
hw/dma/rc4030.c | 462 +-
hw/dma/sun4m_iommu.c | 3 +-
hw/dma/xilinx_axidma.c | 1 -
hw/gpio/max7310.c | 2 +-
hw/gpio/omap_gpio.c | 16 +-
hw/gpio/pl061.c | 2 +-
hw/gpio/zaurus.c | 2 +-
hw/i2c/Makefile.objs | 2 +-
hw/i2c/omap_i2c.c | 10 +-
hw/i2c/smbus_ich9.c | 5 +-
hw/i386/Makefile.objs | 8 +-
hw/i386/acpi-build.c | 1721 ++--
hw/i386/acpi-defs.h | 368 -
hw/i386/acpi-dsdt-cpu-hotplug.dsl | 17 +-
hw/i386/acpi-dsdt-isa.dsl | 11 -
hw/i386/acpi-dsdt-mem-hotplug.dsl | 49 +-
hw/i386/acpi-dsdt-pci-crs.dsl | 92 -
hw/i386/acpi-dsdt.dsl | 46 -
hw/i386/acpi-dsdt.hex.generated | 714 +--
hw/i386/bios-linker-loader.c | 157 -
hw/i386/bios-linker-loader.h | 27 -
hw/i386/intel_iommu.c | 6 +-
hw/i386/kvm/clock.c | 3 +-
hw/i386/kvm/i8254.c | 2 +-
hw/i386/kvm/pci-assign.c | 63 +-
hw/i386/multiboot.c | 42 +-
hw/i386/pc.c | 578 +-
hw/i386/pc_piix.c | 745 +-
hw/i386/pc_q35.c | 273 +-
hw/i386/pc_sysfw.c | 4 +-
hw/i386/q35-acpi-dsdt.dsl | 19 -
hw/i386/q35-acpi-dsdt.hex.generated | 662 +--
hw/i386/smbios.c | 32 +-
hw/i386/ssdt-mem.dsl | 77 -
hw/i386/ssdt-mem.hex.generated | 213 -
hw/i386/ssdt-misc.dsl | 122 -
hw/i386/ssdt-misc.hex.generated | 399 -
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/ssdt-tpm.dsl | 43 -
hw/i386/ssdt-tpm.hex.generated | 95 -
hw/ide/ahci.c | 660 +-
hw/ide/ahci.h | 58 +-
hw/ide/atapi.c | 131 +-
hw/ide/cmd646.c | 8 +-
hw/ide/core.c | 209 +-
hw/ide/ich.c | 14 +-
hw/ide/internal.h | 24 +-
hw/ide/isa.c | 7 +-
hw/ide/macio.c | 476 +-
hw/ide/pci.c | 142 +-
hw/ide/pci.h | 12 +-
hw/ide/piix.c | 13 +-
hw/ide/qdev.c | 9 +-
hw/ide/via.c | 9 +-
hw/input/Makefile.objs | 6 +
hw/input/adb.c | 22 +-
hw/input/hid.c | 53 +-
hw/input/lm832x.c | 2 +-
hw/input/milkymist-softusb.c | 19 +-
hw/input/pckbd.c | 22 +-
hw/input/ps2.c | 27 +-
hw/input/virtio-input-hid.c | 514 ++
hw/input/virtio-input-host.c | 189 +
hw/input/virtio-input.c | 293 +
hw/intc/Makefile.objs | 1 +
hw/intc/allwinner-a10-pic.c | 8 +-
hw/intc/apic.c | 9 +-
hw/intc/apic_common.c | 42 +-
hw/intc/arm_gic.c | 470 +-
hw/intc/arm_gic_common.c | 43 +-
hw/intc/arm_gic_kvm.c | 99 +-
hw/intc/arm_gicv2m.c | 192 +
hw/intc/armv7m_nvic.c | 19 +-
hw/intc/etraxfs_pic.c | 8 +-
hw/intc/exynos4210_gic.c | 7 +-
hw/intc/gic_internal.h | 29 +-
hw/intc/i8259.c | 4 +-
hw/intc/lm32_pic.c | 4 +-
hw/intc/omap_intc.c | 9 +-
hw/intc/openpic.c | 286 +-
hw/intc/openpic_kvm.c | 1 -
hw/intc/s390_flic.c | 6 +-
hw/intc/xics.c | 20 +-
hw/intc/xics_kvm.c | 13 +-
hw/ipack/tpci200.c | 6 +-
hw/isa/i82378.c | 16 +-
hw/isa/isa-bus.c | 41 +-
hw/isa/lpc_ich9.c | 76 +-
hw/isa/pc87312.c | 4 +
hw/isa/piix4.c | 16 +-
hw/isa/vt82c686.c | 119 +-
hw/lm32/lm32_boards.c | 20 +-
hw/lm32/lm32_hwsetup.h | 3 +-
hw/lm32/milkymist-hw.h | 4 +-
hw/lm32/milkymist.c | 11 +-
hw/m68k/an5206.c | 3 +-
hw/m68k/dummy_m68k.c | 10 +-
hw/m68k/mcf5208.c | 3 +-
hw/m68k/mcf_intc.c | 14 +
hw/mem/pc-dimm.c | 150 +-
hw/microblaze/boot.c | 20 +-
hw/microblaze/petalogix_ml605_mmu.c | 28 +-
hw/microblaze/petalogix_s3adsp1800_mmu.c | 17 +-
hw/mips/Makefile.objs | 3 +-
hw/mips/gt64xxx_pci.c | 95 +-
hw/mips/mips_fulong2e.c | 16 +-
hw/mips/mips_jazz.c | 100 +-
hw/mips/mips_malta.c | 41 +-
hw/mips/mips_mipssim.c | 5 +-
hw/mips/mips_r4k.c | 29 +-
hw/misc/Makefile.objs | 7 +-
hw/misc/applesmc.c | 5 +-
hw/misc/arm_integrator_debug.c | 2 +-
hw/misc/edu.c | 408 +
hw/misc/ivshmem.c | 3 +-
hw/misc/macio/cuda.c | 9 +-
hw/misc/macio/mac_dbdma.c | 12 +-
hw/misc/macio/macio.c | 112 +-
hw/misc/milkymist-pfpu.c | 2 +-
hw/misc/omap_gpmc.c | 3 +-
hw/misc/omap_l4.c | 3 +-
hw/misc/omap_sdrc.c | 3 +-
hw/misc/omap_tap.c | 3 +-
hw/misc/pci-testdev.c | 6 +-
hw/misc/slavio_misc.c | 5 +-
hw/misc/stm32f2xx_syscfg.c | 160 +
hw/misc/vfio.c | 4472 ----------
hw/misc/zynq_slcr.c | 8 +-
hw/net/Makefile.objs | 5 +
hw/net/allwinner_emac.c | 8 -
hw/net/cadence_gem.c | 106 +-
hw/net/dp8393x.c | 401 +-
hw/net/e1000.c | 54 +-
hw/net/eepro100.c | 25 +-
hw/net/etraxfs_eth.c | 19 -
hw/net/fsl_etsec/etsec.c | 31 +-
hw/net/fsl_etsec/etsec.h | 4 +-
hw/net/fsl_etsec/rings.c | 17 +-
hw/net/lan9118.c | 14 -
hw/net/lance.c | 12 +-
hw/net/mcf_fec.c | 109 +-
hw/net/milkymist-minimac2.c | 41 +-
hw/net/mipsnet.c | 17 +-
hw/net/ne2000-isa.c | 8 -
hw/net/ne2000.c | 14 +-
hw/net/opencores_eth.c | 5 -
hw/net/pcnet-pci.c | 64 +-
hw/net/pcnet.c | 48 +-
hw/net/pcnet.h | 4 +-
hw/net/rocker/qmp-norocker.c | 50 +
hw/net/rocker/rocker.c | 1553 ++++
hw/net/rocker/rocker.h | 84 +
hw/net/rocker/rocker_desc.c | 377 +
hw/net/rocker/rocker_desc.h | 53 +
hw/net/rocker/rocker_fp.c | 263 +
hw/net/rocker/rocker_fp.h | 53 +
hw/net/rocker/rocker_hw.h | 493 ++
hw/net/rocker/rocker_of_dpa.c | 2630 ++++++
hw/net/rocker/rocker_of_dpa.h | 22 +
hw/net/rocker/rocker_tlv.h | 244 +
hw/net/rocker/rocker_world.c | 106 +
hw/net/rocker/rocker_world.h | 60 +
hw/net/rtl8139.c | 124 +-
hw/net/smc91c111.c | 8 -
hw/net/spapr_llan.c | 26 +-
hw/net/stellaris_enet.c | 22 +-
hw/net/vhost_net.c | 85 +-
hw/net/virtio-net.c | 377 +-
hw/net/vmxnet3.c | 106 +-
hw/net/vmxnet_rx_pkt.c | 19 +-
hw/net/vmxnet_rx_pkt.h | 20 +-
hw/net/xen_nic.c | 41 +-
hw/net/xgmac.c | 16 +-
hw/net/xilinx_axienet.c | 27 +-
hw/net/xilinx_ethlite.c | 9 +-
hw/nvram/fw_cfg.c | 280 +-
hw/nvram/spapr_nvram.c | 19 +-
hw/pci-bridge/Makefile.objs | 6 +-
hw/pci-bridge/dec.c | 5 +-
hw/pci-bridge/i82801b11.c | 21 -
hw/pci-bridge/pci_bridge_dev.c | 131 +-
hw/pci-bridge/pci_expander_bridge.c | 286 +
hw/pci-host/Makefile.objs | 1 +
hw/pci-host/apb.c | 9 +-
hw/pci-host/bonito.c | 12 +-
hw/pci-host/gpex.c | 154 +
hw/pci-host/grackle.c | 5 +-
hw/pci-host/pam.c | 20 -
hw/pci-host/piix.c | 124 +-
hw/pci-host/ppce500.c | 117 +-
hw/pci-host/prep.c | 12 +-
hw/pci-host/q35.c | 149 +-
hw/pci-host/uninorth.c | 25 +-
hw/pci-host/versatile.c | 16 +-
hw/pci/Makefile.objs | 2 -
hw/pci/msi.c | 23 +-
hw/pci/msix.c | 32 +-
hw/pci/pci-hotplug-old.c | 343 -
hw/pci/pci-stub.c | 17 +-
hw/pci/pci.c | 313 +-
hw/pci/pcie.c | 5 +-
hw/pci/pcie_aer.c | 57 +-
hw/pci/pcie_host.c | 16 +-
hw/pci/shpc.c | 24 +-
hw/pci/slotid_cap.c | 2 +-
hw/pcmcia/pxa2xx.c | 6 +-
hw/ppc/Makefile.objs | 2 +-
hw/ppc/e500.c | 75 +-
hw/ppc/e500.h | 5 +
hw/ppc/e500plat.c | 5 +
hw/ppc/mac_newworld.c | 58 +-
hw/ppc/mac_oldworld.c | 19 +-
hw/ppc/mpc8544ds.c | 11 +
hw/ppc/ppc.c | 172 +-
hw/ppc/ppc405_boards.c | 2 +-
hw/ppc/ppc440_bamboo.c | 7 +-
hw/ppc/ppce500_spin.c | 2 +-
hw/ppc/prep.c | 177 +-
hw/ppc/spapr.c | 770 ++-
hw/ppc/spapr_drc.c | 745 ++
hw/ppc/spapr_events.c | 349 +-
hw/ppc/spapr_hcall.c | 41 +-
hw/ppc/spapr_iommu.c | 101 +-
hw/ppc/spapr_pci.c | 1053 +++-
hw/ppc/spapr_pci_vfio.c | 182 +-
hw/ppc/spapr_rtas.c | 446 +-
hw/ppc/spapr_rtc.c | 211 +
hw/ppc/spapr_vio.c | 67 +-
hw/ppc/virtex_ml507.c | 9 +-
hw/s390x/Makefile.objs | 1 +
hw/s390x/css.c | 113 +-
hw/s390x/css.h | 2 +
hw/s390x/event-facility.c | 2 +-
hw/s390x/ipl.c | 221 +-
hw/s390x/ipl.h | 25 +
hw/s390x/s390-pci-bus.c | 596 ++
hw/s390x/s390-pci-bus.h | 251 +
hw/s390x/s390-pci-inst.c | 839 ++
hw/s390x/s390-pci-inst.h | 289 +
hw/s390x/s390-virtio-bus.c | 242 +-
hw/s390x/s390-virtio-bus.h | 40 +-
hw/s390x/s390-virtio-ccw.c | 117 +-
hw/s390x/s390-virtio.c | 79 +-
hw/s390x/s390-virtio.h | 10 +-
hw/s390x/sclp.c | 19 +-
hw/s390x/sclpcpu.c | 2 +
hw/s390x/sclpquiesce.c | 1 +
hw/s390x/virtio-ccw.c | 674 +-
hw/s390x/virtio-ccw.h | 32 +-
hw/scsi/esp-pci.c | 28 +-
hw/scsi/lsi53c895a.c | 21 +-
hw/scsi/megasas.c | 86 +-
hw/scsi/scsi-bus.c | 24 +-
hw/scsi/scsi-disk.c | 54 +-
hw/scsi/scsi-generic.c | 6 +-
hw/scsi/spapr_vscsi.c | 15 +-
hw/scsi/vhost-scsi.c | 64 +-
hw/scsi/virtio-scsi-dataplane.c | 16 +-
hw/scsi/virtio-scsi.c | 78 +-
hw/scsi/vmw_pvscsi.c | 50 +-
hw/sd/milkymist-memcard.c | 3 +
hw/sd/omap_mmc.c | 3 +-
hw/sd/pl181.c | 3 +
hw/sd/pxa2xx_mmci.c | 68 +-
hw/sd/sd.c | 20 +-
hw/sd/sdhci.c | 217 +-
hw/sd/sdhci.h | 39 +-
hw/sd/ssi-sd.c | 1 +
hw/sh4/r2d.c | 20 +-
hw/sparc/leon3.c | 4 +-
hw/sparc/sun4m.c | 34 +-
hw/sparc64/sun4u.c | 44 +-
hw/ssi/omap_spi.c | 3 +-
hw/timer/Makefile.objs | 2 +
hw/timer/a9gtimer.c | 6 +-
hw/timer/arm_mptimer.c | 15 +-
hw/timer/arm_timer.c | 6 +-
hw/timer/cadence_ttc.c | 9 +-
hw/timer/hpet.c | 21 +-
hw/timer/i8254.c | 6 +
hw/timer/m48t59.c | 359 +-
hw/timer/mc146818rtc.c | 96 +-
hw/timer/omap_gptimer.c | 2 +-
hw/timer/stm32f2xx_timer.c | 328 +
hw/tpm/Makefile.objs | 2 +-
hw/tpm/tpm_int.h | 8 +
hw/tpm/tpm_passthrough.c | 133 +-
hw/tpm/tpm_tis.c | 272 +-
hw/tpm/tpm_tis.h | 3 +-
hw/tpm/tpm_util.c | 126 +
hw/tpm/tpm_util.h | 28 +
hw/unicore32/puv3.c | 14 +-
hw/usb/Makefile.objs | 11 +-
hw/usb/bus.c | 82 +-
hw/usb/ccid-card-emulated.c | 1 -
hw/usb/ccid-card-passthru.c | 2 +-
hw/usb/core.c | 41 -
hw/usb/desc-msos.c | 2 +-
hw/usb/dev-audio.c | 23 +-
hw/usb/dev-bluetooth.c | 24 +-
hw/usb/dev-hid.c | 34 +-
hw/usb/dev-hub.c | 11 +-
hw/usb/dev-mtp.c | 15 +-
hw/usb/dev-network.c | 40 +-
hw/usb/dev-serial.c | 52 +-
hw/usb/dev-smartcard-reader.c | 56 +-
hw/usb/dev-storage.c | 83 +-
hw/usb/dev-uas.c | 15 +-
hw/usb/dev-wacom.c | 9 +-
hw/usb/hcd-ehci-pci.c | 16 +-
hw/usb/hcd-ehci-sysbus.c | 10 +
hw/usb/hcd-ehci.c | 35 +-
hw/usb/hcd-ehci.h | 2 +-
hw/usb/hcd-musb.c | 20 +-
hw/usb/hcd-ohci.c | 75 +-
hw/usb/hcd-uhci.c | 81 +-
hw/usb/hcd-xhci.c | 17 +-
hw/usb/host-legacy.c | 1 -
hw/usb/host-libusb.c | 11 +-
hw/usb/host-stub.c | 2 +-
hw/usb/redirect.c | 73 +-
hw/vfio/Makefile.objs | 6 +
hw/vfio/calxeda-xgmac.c | 55 +
hw/vfio/common.c | 972 +++
hw/vfio/pci.c | 3797 +++++++++
hw/vfio/platform.c | 715 ++
hw/virtio/Makefile.objs | 2 +-
hw/virtio/dataplane/Makefile.objs | 2 +-
hw/virtio/dataplane/vring.c | 140 +-
hw/virtio/vhost-backend.c | 2 +-
hw/virtio/vhost-user.c | 22 +-
hw/virtio/vhost.c | 171 +-
hw/virtio/virtio-balloon.c | 56 +-
hw/virtio/virtio-bus.c | 40 +-
hw/virtio/virtio-mmio.c | 208 +-
hw/virtio/virtio-pci.c | 1057 ++-
hw/virtio/virtio-pci.h | 89 +-
hw/virtio/virtio-rng.c | 26 +-
hw/virtio/virtio.c | 463 +-
hw/watchdog/Makefile.objs | 1 +
hw/watchdog/watchdog.c | 12 +-
hw/watchdog/wdt_diag288.c | 130 +
hw/watchdog/wdt_i6300esb.c | 34 +-
hw/watchdog/wdt_ib700.c | 2 +-
hw/xen/xen_backend.c | 4 +-
hw/xen/xen_pt.c | 12 +-
hw/xen/xen_pt.h | 4 +
hw/xen/xen_pt_config_init.c | 8 +-
hw/xtensa/sim.c | 2 +-
hw/xtensa/xtfpga.c | 32 +-
include/block/accounting.h | 3 +
include/block/aio.h | 82 +-
include/block/block.h | 105 +-
include/block/block_int.h | 85 +-
include/block/blockjob.h | 30 +-
include/block/coroutine.h | 10 -
include/block/coroutine_int.h | 1 +
include/block/nbd.h | 17 +-
include/block/qapi.h | 2 +-
include/block/throttle-groups.h | 46 +
include/block/write-threshold.h | 64 +
include/crypto/aes.h | 68 +
include/crypto/cipher.h | 210 +
include/crypto/desrfb.h | 49 +
include/crypto/hash.h | 189 +
include/crypto/init.h | 29 +
include/disas/bfd.h | 6 +
include/disas/disas.h | 4 +-
include/elf.h | 4 +
include/exec/cpu-all.h | 78 +-
include/exec/cpu-common.h | 10 +-
include/exec/cpu-defs.h | 65 +-
include/exec/cpu_ldst.h | 302 +-
include/exec/cpu_ldst_template.h | 60 +-
include/exec/cpu_ldst_useronly_template.h | 81 +
include/exec/cputlb.h | 5 +-
include/exec/exec-all.h | 59 +-
include/exec/gdbstub.h | 2 +-
include/exec/gen-icount.h | 30 +-
include/exec/memattrs.h | 49 +
include/exec/memory-internal.h | 1 +
include/exec/memory.h | 259 +-
include/exec/ram_addr.h | 142 +-
include/exec/semihost.h | 62 +
include/exec/softmmu-semi.h | 13 +-
include/exec/tb-hash.h | 51 +
include/exec/user/thunk.h | 4 +-
include/fpu/softfloat.h | 451 +-
include/glib-compat.h | 41 +-
include/hw/acpi/acpi-defs.h | 564 ++
include/hw/acpi/acpi.h | 13 +-
include/hw/acpi/aml-build.h | 290 +
include/hw/acpi/bios-linker-loader.h | 27 +
include/hw/acpi/ich9.h | 16 +
include/hw/acpi/memory_hotplug.h | 14 +-
include/hw/acpi/pc-hotplug.h | 5 +-
include/hw/acpi/pcihp.h | 7 +-
include/hw/acpi/tco.h | 82 +
include/hw/acpi/tpm.h | 5 +
include/hw/arm/arm.h | 41 +-
include/hw/arm/fdt.h | 34 +
include/hw/arm/stm32f205_soc.h | 57 +
include/hw/arm/sysbus-fdt.h | 60 +
include/hw/arm/virt-acpi-build.h | 44 +
include/hw/arm/virt.h | 67 +
include/hw/arm/xlnx-zynqmp.h | 63 +
include/hw/block/block.h | 5 +-
include/hw/boards.h | 38 +-
include/hw/char/cadence_uart.h | 53 +
include/hw/char/serial.h | 2 +-
include/hw/char/stm32f2xx_usart.h | 73 +
include/hw/compat.h | 28 +-
include/hw/elf_ops.h | 82 +-
include/hw/hotplug.h | 2 +-
include/hw/hw.h | 6 -
include/hw/i386/apic.h | 2 +-
include/hw/i386/ich9.h | 24 +-
include/hw/i386/pc.h | 208 +-
include/hw/i386/topology.h | 134 +
include/hw/intc/arm_gic_common.h | 24 +-
include/hw/isa/isa.h | 17 +-
include/hw/lm32/lm32_pic.h | 4 +-
include/hw/loader.h | 24 +-
include/hw/mem/pc-dimm.h | 16 +
include/hw/mips/mips.h | 11 +-
include/hw/misc/stm32f2xx_syscfg.h | 61 +
include/hw/misc/vfio.h | 9 -
include/hw/net/allwinner_emac.h | 40 +-
include/hw/net/cadence_gem.h | 73 +
include/hw/net/mii.h | 76 +
include/hw/nmi.h | 1 +
include/hw/nvram/fw_cfg.h | 9 +-
include/hw/pci-host/gpex.h | 56 +
include/hw/pci-host/pam.h | 4 -
include/hw/pci-host/q35.h | 37 +-
include/hw/pci-host/spapr.h | 26 +-
include/hw/pci/msi.h | 1 +
include/hw/pci/pci.h | 42 +-
include/hw/pci/pci_bridge.h | 4 +
include/hw/pci/pci_bus.h | 10 +
include/hw/pci/pci_ids.h | 11 +
include/hw/pci/pci_regs.h | 720 +--
include/hw/pci/pcie_aer.h | 2 +-
include/hw/pci/pcie_host.h | 1 +
include/hw/pci/pcie_regs.h | 20 +-
include/hw/pci/shpc.h | 12 +-
include/hw/ppc/mac_dbdma.h | 8 +-
include/hw/ppc/spapr.h | 165 +-
include/hw/ppc/spapr_drc.h | 201 +
include/hw/ppc/spapr_vio.h | 10 +-
include/hw/ppc/xics.h | 1 +
include/hw/qdev-core.h | 24 +-
include/hw/qdev-properties.h | 22 +-
include/hw/s390x/s390_flic.h | 5 +-
include/hw/s390x/sclp.h | 8 +
include/hw/sparc/grlib.h | 12 +-
include/hw/sparc/sun4m.h | 4 +-
include/hw/sysbus.h | 18 +
include/hw/timer/a9gtimer.h | 2 +-
include/hw/timer/m48t59.h | 61 +-
include/hw/timer/stm32f2xx_timer.h | 101 +
include/hw/usb.h | 19 +-
include/hw/vfio/vfio-calxeda-xgmac.h | 46 +
include/hw/vfio/vfio-common.h | 149 +
include/hw/vfio/vfio-platform.h | 77 +
include/hw/vfio/vfio.h | 9 +
include/hw/virtio/dataplane/vring-accessors.h | 75 +
include/hw/virtio/dataplane/vring.h | 20 +-
include/hw/virtio/vhost-scsi.h | 12 +-
include/hw/virtio/vhost.h | 19 +-
include/hw/virtio/virtio-access.h | 26 +
include/hw/virtio/virtio-balloon.h | 40 +-
include/hw/virtio/virtio-blk.h | 99 +-
include/hw/virtio/virtio-bus.h | 9 +-
include/hw/virtio/virtio-gpu.h | 142 +
include/hw/virtio/virtio-input.h | 119 +
include/hw/virtio/virtio-net.h | 194 +-
include/hw/virtio/virtio-rng.h | 15 +-
include/hw/virtio/virtio-scsi.h | 151 +-
include/hw/virtio/virtio-serial.h | 56 +-
include/hw/virtio/virtio.h | 141 +-
include/hw/virtio/virtio_ring.h | 167 -
include/hw/watchdog/wdt_diag288.h | 36 +
include/hw/xen/xen.h | 1 -
include/hw/xen/xen_common.h | 2 +-
include/migration/migration.h | 46 +-
include/migration/page_cache.h | 10 +-
include/migration/qemu-file.h | 36 +-
include/migration/vmstate.h | 72 +-
include/monitor/monitor.h | 21 +-
include/monitor/qdev.h | 12 +-
include/net/net.h | 15 +-
include/net/slirp.h | 6 +-
include/net/tap.h | 24 +-
include/net/vhost_net.h | 6 +-
include/qapi/error.h | 5 +
include/qapi/qmp/qbool.h | 8 +-
include/qapi/qmp/qdict.h | 8 +-
include/qapi/qmp/qerror.h | 112 +-
include/qapi/qmp/qobject.h | 14 +-
include/qapi/util.h | 2 +-
include/qapi/visitor-impl.h | 6 +-
include/qapi/visitor.h | 2 +-
include/qemu-common.h | 141 +-
include/qemu-io.h | 4 +-
include/qemu/aes.h | 68 -
include/qemu/atomic.h | 73 +-
include/qemu/bitmap.h | 4 +
include/qemu/bitops.h | 77 +-
include/qemu/bswap.h | 11 +-
include/qemu/compatfd.h | 1 -
include/qemu/compiler.h | 6 +
include/qemu/fprintf-fn.h | 17 +
include/qemu/hbitmap.h | 31 +
include/qemu/iov.h | 2 +-
include/qemu/log.h | 5 +-
include/qemu/main-loop.h | 67 +-
include/qemu/option.h | 37 +-
include/qemu/osdep.h | 2 +
include/qemu/queue.h | 57 +-
include/qemu/rcu.h | 156 +
include/qemu/rcu_queue.h | 134 +
include/qemu/sockets.h | 8 +-
include/qemu/thread.h | 7 +-
include/qemu/throttle.h | 48 +-
include/qemu/timer.h | 120 +-
include/qemu/typedefs.h | 109 +-
include/qjson.h | 29 +
include/qom/cpu.h | 38 +-
include/qom/object.h | 197 +-
include/qom/object_interfaces.h | 13 +
include/standard-headers/asm-s390/kvm_virtio.h | 64 +
include/standard-headers/asm-s390/virtio-ccw.h | 21 +
include/standard-headers/linux/if_ether.h | 1 +
include/standard-headers/linux/input.h | 1203 +++
include/standard-headers/linux/pci_regs.h | 719 ++
include/standard-headers/linux/types.h | 2 +
include/standard-headers/linux/virtio_9p.h | 44 +
include/standard-headers/linux/virtio_balloon.h | 84 +
include/standard-headers/linux/virtio_blk.h | 147 +
include/standard-headers/linux/virtio_config.h | 64 +
include/standard-headers/linux/virtio_console.h | 78 +
include/standard-headers/linux/virtio_gpu.h | 206 +
include/standard-headers/linux/virtio_ids.h | 45 +
include/standard-headers/linux/virtio_input.h | 76 +
include/standard-headers/linux/virtio_net.h | 245 +
include/standard-headers/linux/virtio_pci.h | 199 +
include/standard-headers/linux/virtio_ring.h | 171 +
include/standard-headers/linux/virtio_rng.h | 8 +
include/standard-headers/linux/virtio_scsi.h | 172 +
include/standard-headers/linux/virtio_types.h | 46 +
include/sysemu/arch_init.h | 1 -
include/sysemu/balloon.h | 1 -
include/sysemu/block-backend.h | 33 +-
include/sysemu/blockdev.h | 6 +-
include/sysemu/device_tree.h | 9 +
include/sysemu/dma.h | 3 +-
include/sysemu/iothread.h | 1 -
include/sysemu/kvm.h | 45 +-
include/sysemu/kvm_int.h | 39 +
include/sysemu/numa.h | 36 +
include/sysemu/os-win32.h | 4 -
include/sysemu/sysemu.h | 62 +-
include/sysemu/tpm.h | 19 +-
include/sysemu/tpm_backend.h | 25 +-
include/sysemu/tpm_backend_int.h | 2 -
include/ui/console.h | 73 +-
include/ui/egl-helpers.h | 16 +
include/ui/gtk.h | 99 +
include/ui/qemu-pixman.h | 20 +
include/ui/qemu-spice.h | 22 +-
include/ui/sdl2.h | 51 +
include/ui/shader.h | 13 +
include/ui/spice-display.h | 6 +-
iohandler.c | 21 +-
ioport.c | 46 +-
iothread.c | 21 +-
kvm-all.c | 509 +-
kvm-stub.c | 8 +-
libcacard/cac.c | 5 +-
libcacard/card_7816.c | 4 +-
libcacard/event.c | 2 +-
libcacard/libcacard.pc.in | 2 +-
libcacard/vcard.c | 4 +-
libcacard/vcard_emul_nss.c | 4 +-
libcacard/vcardt.c | 4 +-
libcacard/vreader.c | 4 +-
libcacard/vscclient.c | 8 +-
libdecnumber/dpd/decimal128Local.h | 42 -
linux-headers/asm-arm/kvm.h | 11 +-
linux-headers/asm-arm64/kvm.h | 18 +-
linux-headers/asm-mips/kvm.h | 164 +-
linux-headers/asm-s390/kvm.h | 41 +
linux-headers/asm-x86/hyperv.h | 24 +
linux-headers/asm-x86/kvm.h | 14 +-
linux-headers/linux/kvm.h | 95 +-
linux-headers/linux/vfio.h | 105 +-
linux-headers/linux/vhost.h | 14 +
linux-headers/linux/virtio_config.h | 58 +-
linux-headers/linux/virtio_ring.h | 164 +-
linux-user/aarch64/target_cpu.h | 2 +-
linux-user/alpha/syscall_nr.h | 4 +
linux-user/arm/nwfpe/fpopcode.c | 22 -
linux-user/arm/syscall_nr.h | 2 +-
linux-user/arm/target_cpu.h | 15 +-
linux-user/elfload.c | 42 +-
linux-user/main.c | 161 +-
linux-user/mips64/target_signal.h | 2 +-
linux-user/mmap.c | 7 +-
linux-user/signal.c | 65 +-
linux-user/syscall.c | 157 +-
linux-user/syscall_defs.h | 95 +-
linux-user/vm86.c | 57 +-
main-loop.c | 14 +-
memory.c | 487 +-
memory_mapping.c | 2 +-
migration-exec.c | 69 -
migration-fd.c | 68 -
migration-rdma.c | 3438 --------
migration-tcp.c | 103 -
migration-unix.c | 103 -
migration.c | 700 --
migration/Makefile.objs | 10 +
migration/block.c | 895 ++
migration/exec.c | 69 +
migration/fd.c | 88 +
migration/migration.c | 1054 +++
migration/qemu-file-buf.c | 462 +
migration/qemu-file-internal.h | 53 +
migration/qemu-file-stdio.c | 194 +
migration/qemu-file-unix.c | 238 +
migration/qemu-file.c | 613 ++
migration/ram.c | 1670 ++++
migration/rdma.c | 3516 ++++++++
migration/savevm.c | 1605 ++++
migration/tcp.c | 103 +
migration/unix.c | 103 +
migration/vmstate.c | 890 ++
migration/xbzrle.c | 175 +
monitor.c | 990 +--
nbd.c | 287 +-
net/clients.h | 20 +-
net/dump.c | 13 +-
net/hub.c | 13 +-
net/l2tpv3.c | 32 +-
net/net.c | 288 +-
net/netmap.c | 23 +-
net/queue.c | 2 +-
net/slirp.c | 19 +-
net/socket.c | 44 +-
net/tap-aix.c | 17 +-
net/tap-bsd.c | 48 +-
net/tap-haiku.c | 17 +-
net/tap-linux.c | 58 +-
net/tap-linux.h | 2 +
net/tap-solaris.c | 73 +-
net/tap-win32.c | 13 +-
net/tap.c | 251 +-
net/tap_int.h | 6 +-
net/vde.c | 3 +-
net/vhost-user.c | 52 +-
numa.c | 204 +-
os-posix.c | 2 +
page_cache.c | 43 +-
pc-bios/README | 2 +-
pc-bios/bios-256k.bin | Bin 262144 -> 262144
bytes
pc-bios/bios.bin | Bin 131072 -> 131072
bytes
pc-bios/keymaps/ru | 2 +-
pc-bios/openbios-ppc | Bin 746588 -> 746588
bytes
pc-bios/openbios-sparc32 | Bin 381512 -> 381512
bytes
pc-bios/openbios-sparc64 | Bin 1616768 -> 1616768
bytes
pc-bios/qemu.rsrc | 1504 ++++
pc-bios/s390-ccw.img | Bin 17752 -> 13784 bytes
pc-bios/s390-ccw/Makefile | 11 +-
pc-bios/s390-ccw/bootmap.c | 4 +-
pc-bios/s390-ccw/bootmap.h | 2 +-
pc-bios/s390-ccw/main.c | 3 +-
pc-bios/s390-ccw/s390-ccw.h | 4 +
pc-bios/s390-ccw/sclp-ascii.c | 1 +
pc-bios/s390-ccw/start.S | 32 +
pc-bios/s390-ccw/virtio.c | 7 +-
pc-bios/slof.bin | Bin 923896 -> 912720
bytes
pc-bios/u-boot.e500 | Bin 330260 -> 347788
bytes
pc-bios/vgabios-cirrus.bin | Bin 37376 -> 38400 bytes
pc-bios/vgabios-qxl.bin | Bin 37376 -> 38400 bytes
pc-bios/vgabios-stdvga.bin | Bin 37376 -> 38400 bytes
pc-bios/vgabios-virtio.bin | Bin 0 -> 38400 bytes
pc-bios/vgabios-vmware.bin | Bin 37376 -> 38400 bytes
pc-bios/vgabios.bin | Bin 37376 -> 38400 bytes
qapi-schema.json | 539 +-
qapi/block-core.json | 389 +-
qapi/block.json | 2 +-
qapi/common.json | 30 +-
qapi/event.json | 26 +
qapi/opts-visitor.c | 24 +-
qapi/qapi-dealloc-visitor.c | 3 +-
qapi/qapi-util.c | 2 +-
qapi/qapi-visit-core.c | 34 +-
qapi/qmp-dispatch.c | 15 +-
qapi/qmp-input-visitor.c | 30 +-
qapi/qmp-output-visitor.c | 3 +-
qapi/rocker.json | 286 +
qapi/string-input-visitor.c | 24 +-
qapi/string-output-visitor.c | 1 -
qapi/trace.json | 2 +-
qdev-monitor.c | 267 +-
qemu-char.c | 122 +-
qemu-coroutine-io.c | 2 +-
qemu-coroutine-lock.c | 2 +-
qemu-coroutine.c | 135 +-
qemu-doc.texi | 31 +-
qemu-file-stdio.c | 194 -
qemu-file-unix.c | 223 -
qemu-file.c | 995 ---
qemu-img.c | 864 +-
qemu-io-cmds.c | 309 +-
qemu-io.c | 94 +-
qemu-log.c | 4 +-
qemu-nbd.c | 107 +-
qemu-options.hx | 410 +-
qemu-seccomp.c | 4 +-
qemu-tech.texi | 2 +-
qemu-timer.c | 34 +-
qga/channel-win32.c | 2 +-
qga/commands-posix.c | 564 ++-
qga/commands-win32.c | 930 ++-
qga/installer/qemu-ga.wxs | 145 +
qga/main.c | 16 +-
qga/qapi-schema.json | 233 +-
qga/vss-win32/Makefile.objs | 2 +-
qjson.c | 129 +
qmp-commands.hx | 493 +-
qmp.c | 184 +-
qobject/Makefile.objs | 3 +-
qobject/json-parser.c | 9 +-
qobject/qbool.c | 8 +-
qobject/qdict.c | 119 +-
qobject/qerror.c | 148 -
qobject/qjson.c | 21 +-
qobject/qnull.c | 29 +
qom/cpu.c | 15 +-
qom/object.c | 364 +-
qom/object_interfaces.c | 12 +
qtest.c | 149 +-
roms/Makefile | 7 +-
roms/SLOF | 2 +-
roms/config.seabios-128k | 1 +
roms/config.vga-virtio | 6 +
roms/openbios | 2 +-
roms/seabios | 2 +-
rules.mak | 27 +-
savevm.c | 1353 ---
scripts/analyze-migration.py | 597 ++
scripts/checkpatch.pl | 24 +-
scripts/coverity-model.c | 242 +-
scripts/dump-guest-memory.py | 10 +-
scripts/get_maintainer.pl | 45 +-
scripts/kvm/kvm_stat | 69 +-
scripts/kvm/kvm_stat.texi | 55 +
scripts/make_device_config.sh | 18 +-
scripts/qapi-commands.py | 277 +-
scripts/qapi-event.py | 129 +-
scripts/qapi-types.py | 268 +-
scripts/qapi-visit.py | 291 +-
scripts/qapi.py | 892 ++-
scripts/qemu-gdb.py | 75 +
scripts/qmp/qmp-shell | 147 +-
scripts/qmp/qmp.py | 95 +-
scripts/qmp/qom-tree | 75 +
scripts/qtest.py | 71 +
scripts/shaderinclude.pl | 16 +
scripts/tracetool/backend/stderr.py | 10 +-
scripts/tracetool/format/d.py | 26 +-
scripts/update-linux-headers.sh | 56 +-
scripts/vmstate-static-checker.py | 2 +
slirp/misc.c | 1 +
slirp/tcp_input.c | 8 +-
softmmu_template.h | 178 +-
spice-qemu-char.c | 14 +-
stubs/Makefile.objs | 2 -
stubs/arch-query-cpu-def.c | 2 +-
stubs/dump.c | 1 -
stubs/iothread-lock.c | 5 +
stubs/mon-is-qmp.c | 6 +-
stubs/mon-set-error.c | 8 -
stubs/pci-drive-hot-add.c | 10 -
stubs/qmp_pc_dimm_device_list.c | 5 +
stubs/qtest.c | 2 +-
stubs/set-fd-handler.c | 3 +-
target-alpha/Makefile.objs | 2 +-
target-alpha/cpu.c | 9 +-
target-alpha/cpu.h | 108 +-
target-alpha/fpu_helper.c | 530 +-
target-alpha/helper.c | 132 +-
target-alpha/helper.h | 14 +-
target-alpha/int_helper.c | 89 +-
target-alpha/mem_helper.c | 9 +-
target-alpha/sys_helper.c | 2 +-
target-alpha/translate.c | 297 +-
target-alpha/vax_helper.c | 353 +
target-arm/arm-semi.c | 30 +-
target-arm/cpu-qom.h | 12 +
target-arm/cpu.c | 316 +-
target-arm/cpu.h | 722 ++-
target-arm/cpu64.c | 104 +-
target-arm/crypto_helper.c | 116 +-
target-arm/helper-a64.c | 29 +-
target-arm/helper.c | 2678 +++++--
target-arm/helper.h | 3 +-
target-arm/internals.h | 21 +-
target-arm/kvm-consts.h | 4 +
target-arm/kvm-stub.c | 2 +-
target-arm/kvm.c | 174 +-
target-arm/kvm32.c | 133 +-
target-arm/kvm64.c | 232 +-
target-arm/kvm_arm.h | 51 +-
target-arm/machine.c | 88 +-
target-arm/op_helper.c | 233 +-
target-arm/psci.c | 19 +-
target-arm/translate-a64.c | 162 +-
target-arm/translate.c | 355 +-
target-arm/translate.h | 34 +-
target-cris/cpu.c | 25 +-
target-cris/cpu.h | 13 +-
target-cris/helper.c | 11 +-
target-cris/opcode-cris.h | 10 -
target-cris/translate.c | 42 +-
target-cris/translate_v10.c | 6 +-
target-i386/Makefile.objs | 2 -
target-i386/arch_dump.c | 16 +-
target-i386/arch_memory_mapping.c | 15 +-
target-i386/cpu-qom.h | 4 +
target-i386/cpu.c | 603 +-
target-i386/cpu.h | 145 +-
target-i386/fpu_helper.c | 21 +-
target-i386/helper.c | 150 +-
target-i386/helper.h | 12 +-
target-i386/ioport-user.c | 60 -
target-i386/kvm-stub.c | 5 +
target-i386/kvm.c | 300 +-
target-i386/kvm_i386.h | 1 +
target-i386/machine.c | 172 +-
target-i386/misc_helper.c | 59 +-
target-i386/ops_sse.h | 18 +-
target-i386/seg_helper.c | 32 +-
target-i386/smm_helper.c | 333 +-
target-i386/svm_helper.c | 230 +-
target-i386/topology.h | 134 -
target-i386/translate.c | 146 +-
target-lm32/cpu.c | 9 +-
target-lm32/cpu.h | 13 +-
target-lm32/helper.c | 3 +-
target-lm32/translate.c | 48 +-
target-m68k/cpu.c | 9 +-
target-m68k/cpu.h | 13 +-
target-m68k/m68k-qreg.h | 11 -
target-m68k/op_helper.c | 12 +-
target-m68k/translate.c | 44 +-
target-microblaze/cpu-qom.h | 14 +-
target-microblaze/cpu.c | 145 +-
target-microblaze/cpu.h | 60 +-
target-microblaze/helper.c | 22 +-
target-microblaze/mmu.h | 1 -
target-microblaze/op_helper.c | 10 +-
target-microblaze/translate.c | 52 +-
target-mips/Makefile.objs | 2 +-
target-mips/cpu-qom.h | 4 +
target-mips/cpu.c | 10 +-
target-mips/cpu.h | 207 +-
target-mips/dsp_helper.c | 2 +-
target-mips/gdbstub.c | 56 +-
target-mips/helper.c | 69 +-
target-mips/helper.h | 14 +-
target-mips/kvm.c | 59 +-
target-mips/machine.c | 573 +-
target-mips/mips-defs.h | 6 +-
target-mips/mips-semi.c | 373 +
target-mips/msa_helper.c | 161 +-
target-mips/op_helper.c | 698 +-
target-mips/translate.c | 3082 +++++---
target-mips/translate_init.c | 224 +-
target-moxie/cpu.c | 9 +-
target-moxie/cpu.h | 13 +-
target-moxie/machine.c | 1 +
target-moxie/mmu.h | 10 +-
target-moxie/translate.c | 14 +-
target-openrisc/cpu.c | 9 +-
target-openrisc/cpu.h | 16 +-
target-openrisc/translate.c | 55 +-
target-ppc/cpu-models.c | 10 +-
target-ppc/cpu-models.h | 3 +-
target-ppc/cpu.h | 58 +-
target-ppc/fpu_helper.c | 85 +-
target-ppc/helper.h | 4 +-
target-ppc/int_helper.c | 21 +-
target-ppc/kvm.c | 122 +-
target-ppc/kvm_ppc.h | 5 +
target-ppc/machine.c | 70 +-
target-ppc/mem_helper.c | 22 +
target-ppc/misc_helper.c | 7 +-
target-ppc/mmu-hash32.c | 18 +-
target-ppc/mmu-hash64.c | 60 +-
target-ppc/mmu-hash64.h | 3 +
target-ppc/mmu_helper.c | 61 +-
target-ppc/translate.c | 435 +-
target-ppc/translate_init.c | 298 +-
target-s390x/Makefile.objs | 2 +-
target-s390x/arch_dump.c | 42 +-
target-s390x/cc_helper.c | 22 +-
target-s390x/cpu-qom.h | 4 +
target-s390x/cpu.c | 39 +-
target-s390x/cpu.h | 351 +-
target-s390x/fpu_helper.c | 43 +-
target-s390x/gdbstub.c | 51 +-
target-s390x/helper.c | 511 +-
target-s390x/helper.h | 28 +-
target-s390x/insn-data.def | 168 +-
target-s390x/int_helper.c | 51 +-
target-s390x/ioinst.c | 250 +-
target-s390x/ioinst.h | 7 +-
target-s390x/kvm.c | 1154 +++-
target-s390x/machine.c | 134 +-
target-s390x/mem_helper.c | 347 +-
target-s390x/misc_helper.c | 227 +-
target-s390x/mmu_helper.c | 480 ++
target-s390x/translate.c | 719 ++-
target-sh4/cpu.c | 12 +-
target-sh4/cpu.h | 62 +-
target-sh4/gdbstub.c | 8 +-
target-sh4/helper.c | 29 +-
target-sh4/helper.h | 1 -
target-sh4/op_helper.c | 148 +-
target-sh4/translate.c | 361 +-
target-sparc/cpu.c | 12 +-
target-sparc/cpu.h | 13 +-
target-sparc/ldst_helper.c | 34 +-
target-sparc/mmu_helper.c | 7 +-
target-sparc/translate.c | 51 +-
target-tricore/cpu.c | 35 +-
target-tricore/cpu.h | 26 +-
target-tricore/csfr.def | 124 +
target-tricore/helper.h | 109 +
target-tricore/op_helper.c | 2295 +++++-
target-tricore/translate.c | 8830 ++++++++++++++++----
target-tricore/tricore-opcodes.h | 129 +-
target-unicore32/cpu.c | 9 +-
target-unicore32/cpu.h | 9 +-
target-unicore32/helper.c | 10 +-
target-unicore32/translate.c | 20 +-
target-xtensa/core-dc232b.c | 2 +-
target-xtensa/core-dc233c.c | 2 +-
target-xtensa/core-fsf.c | 7 +-
target-xtensa/cpu-qom.h | 3 +
target-xtensa/cpu.c | 10 +-
target-xtensa/cpu.h | 44 +-
target-xtensa/gdbstub.c | 25 +-
target-xtensa/helper.c | 14 +
target-xtensa/helper.h | 2 +-
target-xtensa/import_core.sh | 6 +-
target-xtensa/op_helper.c | 43 +-
target-xtensa/overlay_tool.h | 4 +-
target-xtensa/translate.c | 703 +-
tcg/aarch64/tcg-target.c | 145 +-
tcg/aarch64/tcg-target.h | 1 +
tcg/arm/tcg-target.c | 59 +-
tcg/arm/tcg-target.h | 1 +
tcg/i386/tcg-target.c | 239 +-
tcg/i386/tcg-target.h | 1 +
tcg/ia64/tcg-target.c | 51 +-
tcg/ia64/tcg-target.h | 2 +
tcg/mips/tcg-target.c | 90 +-
tcg/mips/tcg-target.h | 1 +
tcg/optimize.c | 388 +-
tcg/ppc/tcg-target.c | 66 +-
tcg/ppc/tcg-target.h | 1 +
tcg/s390/tcg-target.c | 86 +-
tcg/s390/tcg-target.h | 1 +
tcg/sparc/tcg-target.c | 72 +-
tcg/sparc/tcg-target.h | 1 +
tcg/tcg-be-ldst.h | 29 +-
tcg/tcg-op.c | 1945 +++++
tcg/tcg-op.h | 2484 +-----
tcg/tcg-opc.h | 17 +-
tcg/tcg.c | 638 +-
tcg/tcg.h | 230 +-
tcg/tci/tcg-target.c | 25 +-
tcg/tci/tcg-target.h | 4 +-
tci.c | 60 +-
tests/.gitignore | 6 +
tests/Makefile | 142 +-
tests/acpi-test-data/pc/DSDT | Bin 3621 -> 3028 bytes
tests/acpi-test-data/pc/SSDT | Bin 2279 -> 2486 bytes
tests/acpi-test-data/pc/SSDT.bridge | Bin 0 -> 4345 bytes
tests/acpi-test-data/q35/DSDT | Bin 8211 -> 7666 bytes
tests/acpi-test-data/q35/SSDT | Bin 560 -> 691 bytes
tests/acpi-test-data/q35/SSDT.bridge | Bin 0 -> 708 bytes
tests/ahci-test.c | 1827 +++--
tests/bios-tables-test.c | 135 +-
tests/check-qdict.c | 67 +
tests/check-qjson.c | 26 +-
tests/check-qom-proplist.c | 302 +
tests/device-introspect-test.c | 158 +
tests/display-vga-test.c | 18 +
tests/drive_del-test.c | 24 +-
tests/e1000-test.c | 4 +-
tests/eepro100-test.c | 5 +-
tests/endianness-test.c | 20 +-
tests/fdc-test.c | 36 +-
tests/fw_cfg-test.c | 26 +-
tests/hd-geo-test.c | 4 +-
tests/i440fx-test.c | 17 +-
tests/ide-test.c | 98 +-
tests/libqos/ahci.c | 962 +++
tests/libqos/ahci.h | 586 ++
tests/libqos/libqos-pc.c | 29 +
tests/libqos/libqos-pc.h | 10 +
tests/libqos/libqos.c | 214 +
tests/libqos/libqos.h | 38 +
tests/libqos/malloc-generic.c | 39 +
tests/libqos/malloc-generic.h | 21 +
tests/libqos/malloc-pc.c | 296 +-
tests/libqos/malloc-pc.h | 11 +-
tests/libqos/malloc.c | 374 +
tests/libqos/malloc.h | 32 +-
tests/libqos/virtio-mmio.c | 198 +
tests/libqos/virtio-mmio.h | 46 +
tests/libqos/virtio-pci.c | 66 +-
tests/libqos/virtio-pci.h | 24 +-
tests/libqos/virtio.c | 8 +-
tests/libqos/virtio.h | 26 +-
tests/libqtest.c | 138 +-
tests/libqtest.h | 161 +
tests/multiboot/Makefile | 5 +-
tests/multiboot/libc.c | 12 +
tests/multiboot/libc.h | 1 +
tests/multiboot/mmap.out | 37 +-
tests/multiboot/module.txt | 1 +
tests/multiboot/modules.c | 55 +
tests/multiboot/modules.out | 38 +
tests/multiboot/run_test.sh | 9 +-
tests/nvme-test.c | 2 +-
tests/pc-cpu-test.c | 146 +
tests/q35-test.c | 91 +
tests/qapi-schema/alternate-array.err | 1 +
tests/qapi-schema/alternate-array.exit | 1 +
tests/qapi-schema/alternate-array.json | 7 +
tests/qapi-schema/alternate-base.err | 1 +
tests/qapi-schema/alternate-base.exit | 1 +
tests/qapi-schema/alternate-base.json | 6 +
tests/qapi-schema/alternate-clash.err | 1 +
tests/qapi-schema/alternate-clash.exit | 1 +
tests/qapi-schema/alternate-clash.json | 3 +
tests/qapi-schema/alternate-conflict-dict.err | 1 +
tests/qapi-schema/alternate-conflict-dict.exit | 1 +
tests/qapi-schema/alternate-conflict-dict.json | 8 +
tests/qapi-schema/alternate-conflict-string.err | 1 +
tests/qapi-schema/alternate-conflict-string.exit | 1 +
tests/qapi-schema/alternate-conflict-string.json | 6 +
tests/qapi-schema/alternate-good.exit | 1 +
tests/qapi-schema/alternate-good.json | 9 +
tests/qapi-schema/alternate-good.out | 6 +
tests/qapi-schema/alternate-nested.err | 1 +
tests/qapi-schema/alternate-nested.exit | 1 +
tests/qapi-schema/alternate-nested.json | 5 +
tests/qapi-schema/alternate-unknown.err | 1 +
tests/qapi-schema/alternate-unknown.exit | 1 +
tests/qapi-schema/alternate-unknown.json | 3 +
tests/qapi-schema/bad-base.err | 1 +
tests/qapi-schema/bad-base.exit | 1 +
tests/qapi-schema/bad-base.json | 3 +
tests/qapi-schema/bad-data.err | 1 +
tests/qapi-schema/bad-data.exit | 1 +
tests/qapi-schema/bad-data.json | 2 +
tests/qapi-schema/bad-ident.err | 1 +
tests/qapi-schema/bad-ident.exit | 1 +
tests/qapi-schema/bad-ident.json | 2 +
tests/qapi-schema/bad-type-bool.err | 1 +
tests/qapi-schema/bad-type-bool.exit | 1 +
tests/qapi-schema/bad-type-bool.json | 2 +
tests/qapi-schema/bad-type-dict.err | 1 +
tests/qapi-schema/bad-type-dict.exit | 1 +
tests/qapi-schema/bad-type-dict.json | 2 +
tests/qapi-schema/bad-type-int.err | 1 +
tests/qapi-schema/bad-type-int.exit | 1 +
tests/qapi-schema/bad-type-int.json | 3 +
tests/qapi-schema/command-int.err | 1 +
tests/qapi-schema/command-int.exit | 1 +
tests/qapi-schema/command-int.json | 3 +
tests/qapi-schema/data-array-empty.err | 1 +
tests/qapi-schema/data-array-empty.exit | 1 +
tests/qapi-schema/data-array-empty.json | 2 +
tests/qapi-schema/data-array-unknown.err | 1 +
tests/qapi-schema/data-array-unknown.exit | 1 +
tests/qapi-schema/data-array-unknown.json | 2 +
tests/qapi-schema/data-int.err | 1 +
tests/qapi-schema/data-int.exit | 1 +
tests/qapi-schema/data-int.json | 2 +
tests/qapi-schema/data-member-array-bad.err | 1 +
tests/qapi-schema/data-member-array-bad.exit | 1 +
tests/qapi-schema/data-member-array-bad.json | 2 +
tests/qapi-schema/data-member-array.exit | 1 +
tests/qapi-schema/data-member-array.json | 4 +
tests/qapi-schema/data-member-array.out | 5 +
tests/qapi-schema/data-member-unknown.err | 1 +
tests/qapi-schema/data-member-unknown.exit | 1 +
tests/qapi-schema/data-member-unknown.json | 2 +
tests/qapi-schema/data-unknown.err | 1 +
tests/qapi-schema/data-unknown.exit | 1 +
tests/qapi-schema/data-unknown.json | 2 +
tests/qapi-schema/double-data.err | 1 +
tests/qapi-schema/double-data.exit | 1 +
tests/qapi-schema/double-data.json | 2 +
tests/qapi-schema/double-type.err | 1 +
tests/qapi-schema/double-type.exit | 1 +
tests/qapi-schema/double-type.json | 2 +
tests/qapi-schema/enum-bad-name.err | 1 +
tests/qapi-schema/enum-bad-name.exit | 1 +
tests/qapi-schema/enum-bad-name.json | 2 +
tests/qapi-schema/enum-clash-member.err | 1 +
tests/qapi-schema/enum-clash-member.exit | 1 +
tests/qapi-schema/enum-clash-member.json | 2 +
tests/qapi-schema/enum-dict-member.err | 1 +
tests/qapi-schema/enum-dict-member.exit | 1 +
tests/qapi-schema/enum-dict-member.json | 2 +
tests/qapi-schema/enum-empty.exit | 1 +
tests/qapi-schema/enum-empty.json | 2 +
tests/qapi-schema/enum-empty.out | 3 +
tests/qapi-schema/enum-int-member.err | 1 +
tests/qapi-schema/enum-int-member.exit | 1 +
tests/qapi-schema/enum-int-member.json | 3 +
tests/qapi-schema/enum-max-member.err | 1 +
tests/qapi-schema/enum-max-member.exit | 1 +
tests/qapi-schema/enum-max-member.json | 3 +
tests/qapi-schema/enum-missing-data.err | 1 +
tests/qapi-schema/enum-missing-data.exit | 1 +
tests/qapi-schema/enum-missing-data.json | 2 +
tests/qapi-schema/enum-union-clash.err | 1 +
tests/qapi-schema/enum-union-clash.exit | 1 +
tests/qapi-schema/enum-union-clash.json | 4 +
tests/qapi-schema/enum-wrong-data.err | 1 +
tests/qapi-schema/enum-wrong-data.exit | 1 +
tests/qapi-schema/enum-wrong-data.json | 2 +
tests/qapi-schema/escape-outside-string.err | 1 +
tests/qapi-schema/escape-outside-string.exit | 1 +
tests/qapi-schema/escape-outside-string.json | 3 +
tests/qapi-schema/escape-too-big.err | 1 +
tests/qapi-schema/escape-too-big.exit | 1 +
tests/qapi-schema/escape-too-big.json | 3 +
tests/qapi-schema/escape-too-short.err | 1 +
tests/qapi-schema/escape-too-short.exit | 1 +
tests/qapi-schema/escape-too-short.json | 3 +
tests/qapi-schema/event-case.exit | 1 +
tests/qapi-schema/event-case.json | 3 +
tests/qapi-schema/event-case.out | 3 +
tests/qapi-schema/event-max.err | 1 +
tests/qapi-schema/event-max.exit | 1 +
tests/qapi-schema/event-max.json | 2 +
tests/qapi-schema/event-nest-struct.err | 2 +-
tests/qapi-schema/flat-union-array-branch.err | 1 +
tests/qapi-schema/flat-union-array-branch.exit | 1 +
tests/qapi-schema/flat-union-array-branch.json | 12 +
tests/qapi-schema/flat-union-bad-base.err | 1 +
tests/qapi-schema/flat-union-bad-base.exit | 1 +
tests/qapi-schema/flat-union-bad-base.json | 13 +
tests/qapi-schema/flat-union-bad-discriminator.err | 1 +
.../qapi-schema/flat-union-bad-discriminator.exit | 1 +
.../qapi-schema/flat-union-bad-discriminator.json | 15 +
tests/qapi-schema/flat-union-base-star.err | 1 +
tests/qapi-schema/flat-union-base-star.exit | 1 +
tests/qapi-schema/flat-union-base-star.json | 12 +
tests/qapi-schema/flat-union-base-union.err | 1 +
tests/qapi-schema/flat-union-base-union.exit | 1 +
tests/qapi-schema/flat-union-base-union.json | 15 +
tests/qapi-schema/flat-union-branch-clash.err | 1 +
tests/qapi-schema/flat-union-branch-clash.exit | 1 +
tests/qapi-schema/flat-union-branch-clash.json | 14 +
tests/qapi-schema/flat-union-inline.err | 1 +
tests/qapi-schema/flat-union-inline.exit | 1 +
tests/qapi-schema/flat-union-inline.json | 11 +
tests/qapi-schema/flat-union-int-branch.err | 1 +
tests/qapi-schema/flat-union-int-branch.exit | 1 +
tests/qapi-schema/flat-union-int-branch.json | 12 +
.../qapi-schema/flat-union-invalid-branch-key.json | 6 +-
.../flat-union-invalid-discriminator.err | 2 +-
.../flat-union-invalid-discriminator.json | 6 +-
tests/qapi-schema/flat-union-no-base.err | 2 +-
tests/qapi-schema/flat-union-no-base.json | 12 +-
.../flat-union-optional-discriminator.err | 1 +
.../flat-union-optional-discriminator.exit | 1 +
.../flat-union-optional-discriminator.json | 10 +
tests/qapi-schema/flat-union-reverse-define.json | 6 +-
tests/qapi-schema/flat-union-reverse-define.out | 12 +-
.../flat-union-string-discriminator.json | 6 +-
tests/qapi-schema/ident-with-escape.exit | 1 +
tests/qapi-schema/ident-with-escape.json | 4 +
tests/qapi-schema/ident-with-escape.out | 3 +
tests/qapi-schema/include-cycle.err | 4 +-
tests/qapi-schema/include-nested-err.err | 2 +-
tests/qapi-schema/indented-expr.json | 4 +-
tests/qapi-schema/indented-expr.out | 2 +-
tests/qapi-schema/missing-type.err | 1 +
tests/qapi-schema/missing-type.exit | 1 +
tests/qapi-schema/missing-type.json | 2 +
tests/qapi-schema/nested-struct-data.err | 1 +
tests/qapi-schema/nested-struct-data.exit | 1 +
tests/qapi-schema/nested-struct-data.json | 4 +
tests/qapi-schema/nested-struct-returns.err | 1 +
tests/qapi-schema/nested-struct-returns.exit | 1 +
tests/qapi-schema/nested-struct-returns.json | 3 +
tests/qapi-schema/qapi-schema-test.json | 66 +-
tests/qapi-schema/qapi-schema-test.out | 73 +-
tests/qapi-schema/redefined-builtin.err | 1 +
tests/qapi-schema/redefined-builtin.exit | 1 +
tests/qapi-schema/redefined-builtin.json | 2 +
tests/qapi-schema/redefined-command.err | 1 +
tests/qapi-schema/redefined-command.exit | 1 +
tests/qapi-schema/redefined-command.json | 3 +
tests/qapi-schema/redefined-event.err | 1 +
tests/qapi-schema/redefined-event.exit | 1 +
tests/qapi-schema/redefined-event.json | 3 +
tests/qapi-schema/redefined-type.err | 1 +
tests/qapi-schema/redefined-type.exit | 1 +
tests/qapi-schema/redefined-type.json | 3 +
tests/qapi-schema/returns-alternate.err | 1 +
tests/qapi-schema/returns-alternate.exit | 1 +
tests/qapi-schema/returns-alternate.json | 3 +
tests/qapi-schema/returns-array-bad.err | 1 +
tests/qapi-schema/returns-array-bad.exit | 1 +
tests/qapi-schema/returns-array-bad.json | 2 +
tests/qapi-schema/returns-int.exit | 1 +
tests/qapi-schema/returns-int.json | 3 +
tests/qapi-schema/returns-int.out | 3 +
tests/qapi-schema/returns-unknown.err | 1 +
tests/qapi-schema/returns-unknown.exit | 1 +
tests/qapi-schema/returns-unknown.json | 2 +
tests/qapi-schema/returns-whitelist.err | 1 +
tests/qapi-schema/returns-whitelist.exit | 1 +
tests/qapi-schema/returns-whitelist.json | 11 +
tests/qapi-schema/struct-base-clash-deep.err | 1 +
tests/qapi-schema/struct-base-clash-deep.exit | 1 +
tests/qapi-schema/struct-base-clash-deep.json | 9 +
tests/qapi-schema/struct-base-clash.err | 1 +
tests/qapi-schema/struct-base-clash.exit | 1 +
tests/qapi-schema/struct-base-clash.json | 6 +
tests/qapi-schema/type-bypass-bad-gen.err | 1 +
tests/qapi-schema/type-bypass-bad-gen.exit | 1 +
tests/qapi-schema/type-bypass-bad-gen.json | 2 +
tests/qapi-schema/type-bypass-no-gen.err | 1 +
tests/qapi-schema/type-bypass-no-gen.exit | 1 +
tests/qapi-schema/type-bypass-no-gen.json | 2 +
tests/qapi-schema/type-bypass.exit | 1 +
tests/qapi-schema/type-bypass.json | 2 +
tests/qapi-schema/type-bypass.out | 3 +
tests/qapi-schema/unicode-str.err | 1 +
tests/qapi-schema/unicode-str.exit | 1 +
tests/qapi-schema/unicode-str.json | 2 +
tests/qapi-schema/union-bad-branch.err | 1 +
tests/qapi-schema/union-bad-branch.exit | 1 +
tests/qapi-schema/union-bad-branch.json | 8 +
tests/qapi-schema/union-base-no-discriminator.err | 1 +
tests/qapi-schema/union-base-no-discriminator.exit | 1 +
tests/qapi-schema/union-base-no-discriminator.json | 14 +
tests/qapi-schema/union-invalid-base.err | 2 +-
tests/qapi-schema/union-invalid-base.json | 8 +-
tests/qapi-schema/union-max.err | 1 +
tests/qapi-schema/union-max.exit | 1 +
tests/qapi-schema/union-max.json | 3 +
tests/qapi-schema/union-optional-branch.err | 1 +
tests/qapi-schema/union-optional-branch.exit | 1 +
tests/qapi-schema/union-optional-branch.json | 2 +
tests/qapi-schema/union-unknown.err | 1 +
tests/qapi-schema/union-unknown.exit | 1 +
tests/qapi-schema/union-unknown.json | 3 +
tests/qapi-schema/unknown-escape.err | 1 +
tests/qapi-schema/unknown-escape.exit | 1 +
tests/qapi-schema/unknown-escape.json | 3 +
tests/qapi-schema/unknown-expr-key.err | 1 +
tests/qapi-schema/unknown-expr-key.exit | 1 +
tests/qapi-schema/unknown-expr-key.json | 2 +
tests/qemu-iotests-quick.sh | 2 +-
tests/qemu-iotests/.gitignore | 1 +
tests/qemu-iotests/001.out | 2 +-
tests/qemu-iotests/002.out | 2 +-
tests/qemu-iotests/003.out | 2 +-
tests/qemu-iotests/004 | 2 +-
tests/qemu-iotests/004.out | 2 +-
tests/qemu-iotests/005.out | 2 +-
tests/qemu-iotests/006 | 54 -
tests/qemu-iotests/006.out | 6 -
tests/qemu-iotests/007 | 3 +
tests/qemu-iotests/007.out | 2 +-
tests/qemu-iotests/008.out | 2 +-
tests/qemu-iotests/009.out | 2 +-
tests/qemu-iotests/010.out | 2 +-
tests/qemu-iotests/011.out | 2 +-
tests/qemu-iotests/012.out | 2 +-
tests/qemu-iotests/013.out | 2 +-
tests/qemu-iotests/014.out | 2 +-
tests/qemu-iotests/015 | 2 +
tests/qemu-iotests/015.out | 2 +-
tests/qemu-iotests/016 | 70 -
tests/qemu-iotests/016.out | 23 -
tests/qemu-iotests/017.out | 2 +-
tests/qemu-iotests/018.out | 2 +-
tests/qemu-iotests/019.out | 4 +-
tests/qemu-iotests/020.out | 4 +-
tests/qemu-iotests/021.out | 2 +-
tests/qemu-iotests/022.out | 2 +-
tests/qemu-iotests/023.out | 16 +-
tests/qemu-iotests/024.out | 6 +-
tests/qemu-iotests/025.out | 2 +-
tests/qemu-iotests/026 | 7 +
tests/qemu-iotests/026.out | 324 +-
tests/qemu-iotests/027.out | 2 +-
tests/qemu-iotests/028.out | 6 +-
tests/qemu-iotests/029 | 2 +
tests/qemu-iotests/029.out | 8 +-
tests/qemu-iotests/030 | 22 +-
tests/qemu-iotests/031.out | 4 +-
tests/qemu-iotests/032.out | 2 +-
tests/qemu-iotests/033 | 66 +-
tests/qemu-iotests/033.out | 58 +-
tests/qemu-iotests/034.out | 4 +-
tests/qemu-iotests/035.out | 2 +-
tests/qemu-iotests/036.out | 6 +-
tests/qemu-iotests/037.out | 4 +-
tests/qemu-iotests/038.out | 4 +-
tests/qemu-iotests/039 | 18 +-
tests/qemu-iotests/039.out | 18 +-
tests/qemu-iotests/040 | 32 +-
tests/qemu-iotests/041 | 66 +-
tests/qemu-iotests/042.out | 2 +-
tests/qemu-iotests/043.out | 52 +-
tests/qemu-iotests/046.out | 4 +-
tests/qemu-iotests/047.out | 2 +-
tests/qemu-iotests/048 | 2 +-
tests/qemu-iotests/048.out | 4 +-
tests/qemu-iotests/049.out | 118 +-
tests/qemu-iotests/050.out | 6 +-
tests/qemu-iotests/051 | 11 +-
tests/qemu-iotests/051.out | 96 +-
tests/qemu-iotests/052.out | 2 +-
tests/qemu-iotests/053.out | 2 +-
tests/qemu-iotests/054.out | 4 +-
tests/qemu-iotests/055 | 232 +-
tests/qemu-iotests/055.out | 4 +-
tests/qemu-iotests/058 | 14 +-
tests/qemu-iotests/059 | 15 +-
tests/qemu-iotests/059.out | 7 +
tests/qemu-iotests/060 | 17 +-
tests/qemu-iotests/060.out | 41 +-
tests/qemu-iotests/061.out | 45 +-
tests/qemu-iotests/062.out | 2 +-
tests/qemu-iotests/064 | 19 +-
tests/qemu-iotests/064.out | 34 +-
tests/qemu-iotests/065 | 23 +-
tests/qemu-iotests/066.out | 2 +-
tests/qemu-iotests/067 | 7 +-
tests/qemu-iotests/067.out | 816 ++-
tests/qemu-iotests/068.out | 2 +-
tests/qemu-iotests/069.out | 4 +-
tests/qemu-iotests/071 | 12 +-
tests/qemu-iotests/071.out | 22 +-
tests/qemu-iotests/072.out | 2 +-
tests/qemu-iotests/073.out | 4 +-
tests/qemu-iotests/076 | 15 +-
tests/qemu-iotests/076.out | 10 +
tests/qemu-iotests/077 | 2 +-
tests/qemu-iotests/077.out | 2 +-
tests/qemu-iotests/079 | 10 +-
tests/qemu-iotests/079.out | 38 +-
tests/qemu-iotests/080 | 2 +
tests/qemu-iotests/080.out | 24 +-
tests/qemu-iotests/081 | 10 +-
tests/qemu-iotests/081.out | 8 +-
tests/qemu-iotests/082 | 14 +-
tests/qemu-iotests/082.out | 97 +-
tests/qemu-iotests/083 | 3 +-
tests/qemu-iotests/083.out | 81 +-
tests/qemu-iotests/084.out | 4 +-
tests/qemu-iotests/085.out | 38 +-
tests/qemu-iotests/086.out | 2 +-
tests/qemu-iotests/087 | 3 +-
tests/qemu-iotests/087.out | 33 +-
tests/qemu-iotests/088.out | 2 +-
tests/qemu-iotests/089 | 8 +-
tests/qemu-iotests/089.out | 6 +-
tests/qemu-iotests/090.out | 2 +-
tests/qemu-iotests/091.out | 2 +-
tests/qemu-iotests/092.out | 8 +-
tests/qemu-iotests/093 | 151 +
tests/qemu-iotests/093.out | 5 +
tests/qemu-iotests/094 | 81 +
tests/qemu-iotests/094.out | 11 +
tests/qemu-iotests/095.out | 6 +-
tests/qemu-iotests/097.out | 24 +-
tests/qemu-iotests/098.out | 16 +-
tests/qemu-iotests/099 | 20 +-
tests/qemu-iotests/099.out | 16 +-
tests/qemu-iotests/100 | 12 +
tests/qemu-iotests/100.out | 14 +-
tests/qemu-iotests/103 | 10 +
tests/qemu-iotests/103.out | 7 +-
tests/qemu-iotests/104 | 11 +-
tests/qemu-iotests/104.out | 4 +-
tests/qemu-iotests/107.out | 2 +-
tests/qemu-iotests/108 | 2 +
tests/qemu-iotests/108.out | 12 +-
tests/qemu-iotests/109 | 132 +
tests/qemu-iotests/109.out | 231 +
tests/qemu-iotests/110 | 94 +
tests/qemu-iotests/110.out | 19 +
tests/qemu-iotests/112 | 187 +
tests/qemu-iotests/112.out | 84 +
tests/qemu-iotests/115 | 95 +
tests/qemu-iotests/115.out | 8 +
tests/qemu-iotests/116 | 96 +
tests/qemu-iotests/116.out | 37 +
tests/qemu-iotests/119 | 60 +
tests/qemu-iotests/119.out | 11 +
tests/qemu-iotests/120 | 65 +
tests/qemu-iotests/120.out | 15 +
tests/qemu-iotests/121 | 102 +
tests/qemu-iotests/121.out | 23 +
tests/qemu-iotests/122 | 223 +
tests/qemu-iotests/122.out | 209 +
tests/qemu-iotests/123 | 62 +
tests/qemu-iotests/123.out | 9 +
tests/qemu-iotests/124 | 363 +
tests/qemu-iotests/124.out | 5 +
tests/qemu-iotests/128 | 84 +
tests/qemu-iotests/128.out | 5 +
tests/qemu-iotests/129 | 86 +
tests/qemu-iotests/129.out | 5 +
tests/qemu-iotests/130 | 95 +
tests/qemu-iotests/130.out | 43 +
tests/qemu-iotests/131 | 77 +
tests/qemu-iotests/131.out | 41 +
tests/qemu-iotests/132 | 59 +
tests/qemu-iotests/132.out | 5 +
tests/qemu-iotests/134 | 69 +
tests/qemu-iotests/134.out | 46 +
tests/qemu-iotests/135 | 54 +
tests/qemu-iotests/135.out | 5 +
tests/qemu-iotests/check | 13 +-
tests/qemu-iotests/common | 16 +-
tests/qemu-iotests/common.config | 4 +-
tests/qemu-iotests/common.filter | 13 +-
tests/qemu-iotests/common.qemu | 15 +-
tests/qemu-iotests/common.rc | 15 +-
tests/qemu-iotests/group | 26 +-
tests/qemu-iotests/iotests.py | 103 +-
tests/qemu-iotests/sample_images/afl5.img.bz2 | Bin 0 -> 175 bytes
tests/qemu-iotests/sample_images/afl9.vmdk.bz2 | Bin 0 -> 178 bytes
tests/qemu-iotests/sample_images/grub_mbr.raw.bz2 | Bin 0 -> 552 bytes
tests/qom-test.c | 4 +-
tests/rcutorture.c | 463 +
tests/rocker/README | 5 +
tests/rocker/all | 19 +
tests/rocker/bridge | 43 +
tests/rocker/bridge-stp | 52 +
tests/rocker/bridge-vlan | 52 +
tests/rocker/bridge-vlan-stp | 64 +
tests/rocker/port | 22 +
tests/rocker/tut.dot | 8 +
tests/rtl8139-test.c | 181 +
tests/tco-test.c | 465 +
tests/test-aio.c | 26 +-
tests/test-coroutine.c | 28 +-
tests/test-crypto-cipher.c | 302 +
tests/test-crypto-hash.c | 209 +
tests/test-hbitmap.c | 293 +
tests/test-opts-visitor.c | 3 +-
tests/test-qemu-opts.c | 40 +-
tests/test-qmp-commands.c | 52 +-
tests/test-qmp-event.c | 4 +-
tests/test-qmp-input-strict.c | 98 +-
tests/test-qmp-input-visitor.c | 119 +-
tests/test-qmp-output-visitor.c | 162 +-
tests/test-rcu-list.c | 316 +
tests/test-throttle.c | 163 +-
tests/test-visitor-serialization.c | 87 +-
tests/test-vmstate.c | 26 +-
tests/test-write-threshold.c | 119 +
tests/test-x86-cpuid.c | 2 +-
tests/usb-hcd-ohci-test.c | 2 +-
tests/usb-hcd-uhci-test.c | 4 +-
tests/usb-hcd-xhci-test.c | 4 +-
tests/virtio-blk-test.c | 331 +-
tests/virtio-scsi-test.c | 201 +-
tests/wdt_ib700-test.c | 15 +-
thread-pool.c | 14 +-
thunk.c | 16 +-
tpm.c | 25 +-
trace-events | 282 +-
trace/control.c | 2 +-
translate-all.c | 144 +-
translate-all.h | 8 +-
ui/Makefile.objs | 30 +-
ui/cocoa.m | 421 +-
ui/console-gl.c | 168 +
ui/console.c | 148 +-
ui/d3des.c | 424 -
ui/d3des.h | 55 -
ui/egl-helpers.c | 148 +
ui/gtk-egl.c | 141 +
ui/gtk.c | 388 +-
ui/input-keymap.c | 4 +
ui/input-legacy.c | 9 -
ui/input.c | 6 +-
ui/keymaps.c | 196 +-
ui/qemu-pixman.c | 29 +-
ui/sdl.c | 66 +-
ui/sdl2-2d.c | 147 +
ui/sdl2-gl.c | 112 +
ui/sdl2-input.c | 100 +
ui/sdl2.c | 403 +-
ui/shader.c | 114 +
ui/shader/texture-blit.frag | 10 +
ui/shader/texture-blit.vert | 10 +
ui/spice-core.c | 52 +-
ui/spice-display.c | 108 +-
ui/vnc-auth-sasl.c | 4 +-
ui/vnc-auth-vencrypt.c | 11 +-
ui/vnc-enc-tight.c | 2 +-
ui/vnc-jobs.c | 14 +-
ui/vnc-jobs.h | 1 -
ui/vnc-tls.c | 82 +-
ui/vnc-tls.h | 7 -
ui/vnc-ws.c | 196 +-
ui/vnc-ws.h | 13 +-
ui/vnc.c | 1156 ++-
ui/vnc.h | 30 +-
ui/vnc_keysym.h | 1 +
ui/x_keymap.c | 4 +-
user-exec.c | 17 +-
util/Makefile.objs | 3 +-
util/aes.c | 1652 ----
util/bitmap.c | 83 +
util/compatfd.c | 19 -
util/cutils.c | 33 +-
util/envlist.c | 32 +-
util/error.c | 14 +-
util/event_notifier-posix.c | 3 +-
util/hbitmap.c | 102 +-
util/iov.c | 18 +-
util/osdep.c | 67 +-
util/oslib-posix.c | 71 +-
util/oslib-win32.c | 24 +
util/qemu-config.c | 123 +-
util/qemu-error.c | 5 +-
util/qemu-option.c | 196 +-
util/qemu-sockets.c | 98 +-
util/qemu-thread-posix.c | 43 +-
util/qemu-thread-win32.c | 48 +-
util/rcu.c | 330 +
util/throttle.c | 81 +-
util/uri.c | 179 +-
vl.c | 1339 ++--
vmstate.c | 687 --
xbzrle.c | 175 -
xen-common.c | 5 +
xen-hvm-stub.c | 4 -
xen-hvm.c | 22 +-
xen-mapcache.c | 94 +-
1892 files changed, 146035 insertions(+), 66598 deletions(-)
diff --git a/.gitignore b/.gitignore
index e32a584..61bc492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@
/trace/generated-tcg-tracers.h
/trace/generated-ust-provider.h
/trace/generated-ust.c
+/ui/shader/texture-blit-frag.h
+/ui/shader/texture-blit-vert.h
/libcacard/trace/generated-tracers.c
*-timestamp
/*-softmmu
@@ -37,14 +39,8 @@
/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
@@ -56,8 +52,7 @@
/qmp-commands.txt
/vscclient
/fsdev/virtfs-proxy-helper
-/fsdev/virtfs-proxy-helper.1
-/fsdev/virtfs-proxy-helper.pod
+*.[1-9]
*.a
*.aux
*.cp
@@ -70,6 +65,7 @@
*.ky
*.log
*.pdf
+*.pod
*.cps
*.fns
*.kys
diff --git a/.travis.yml b/.travis.yml
index ad66e5b..0ac170b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,3 +98,6 @@ matrix:
EXTRA_PKGS="liblttng-ust-dev liburcu-dev"
EXTRA_CONFIG="--enable-trace-backends=ust"
compiler: gcc
+ - env: TARGETS=i386-softmmu,x86_64-softmmu
+ EXTRA_CONFIG="--enable-modules"
+ compiler: gcc
diff --git a/LICENSE b/LICENSE
index da70e94..0e0b4b9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -11,7 +11,7 @@ option) any later version.
As of July 2013, contributions under version 2 of the GNU General Public
License (and no later version) are only accepted for the following files
-or directories: bsd-user/, linux-user/, hw/misc/vfio.c, hw/xen/xen_pt*.
+or directories: bsd-user/, linux-user/, hw/vfio/, hw/xen/xen_pt*.
3) The Tiny Code Generator (TCG) is released under the BSD license
(see license headers in files).
diff --git a/MAINTAINERS b/MAINTAINERS
index bcb69e8..978b717 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -50,14 +50,12 @@ Descriptions of section entries:
General Project Administration
------------------------------
-M: Anthony Liguori <aliguori@xxxxxxxxxx>
M: Peter Maydell <peter.maydell@xxxxxxxxxx>
Responsible Disclosure, Reporting Security Issues
------------------------------
W: http://wiki.qemu.org/SecurityProcess
M: Michael S. Tsirkin <mst@xxxxxxxxxx>
-M: Anthony Liguori <aliguori@xxxxxxxxxx>
L: secalert@xxxxxxxxxx
Guest CPU cores (TCG):
@@ -98,8 +96,12 @@ LM32
M: Michael Walle <michael@xxxxxxxx>
S: Maintained
F: target-lm32/
+F: disas/lm32.c
F: hw/lm32/
-F: hw/char/lm32_*
+F: hw/*/lm32_*
+F: hw/*/milkymist-*
+F: include/hw/char/lm32_juart.h
+F: include/hw/lm32/
F: tests/tcg/lm32/
M68K
@@ -155,6 +157,7 @@ F: hw/sh4/
SPARC
M: Blue Swirl <blauwirbel@xxxxxxxxx>
+M: Mark Cave-Ayland <mark.cave-ayland@xxxxxxxxxxxx>
S: Maintained
F: target-sparc/
F: hw/sparc/
@@ -169,7 +172,8 @@ F: hw/unicore32/
X86
M: Paolo Bonzini <pbonzini@xxxxxxxxxx>
M: Richard Henderson <rth@xxxxxxxxxxx>
-S: Odd Fixes
+M: Eduardo Habkost <ehabkost@xxxxxxxxxx>
+S: Maintained
F: target-i386/
F: hw/i386/
@@ -352,6 +356,13 @@ F: hw/misc/zynq_slcr.c
F: hw/*/cadence_*
F: hw/ssi/xilinx_spips.c
+ARM ACPI Subsystem
+M: Shannon Zhao <zhaoshenglong@xxxxxxxxxx>
+M: Shannon Zhao <shannon.zhao@xxxxxxxxxx>
+S: Maintained
+F: hw/arm/virt-acpi-build.c
+F: include/hw/arm/virt-acpi-build.h
+
CRIS Machines
-------------
Axis Dev88
@@ -482,7 +493,8 @@ F: hw/ppc/prep.c
F: hw/pci-host/prep.[hc]
F: hw/isa/pc87312.[hc]
-sPAPR
+sPAPR (pseries)
+M: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
M: Alexander Graf <agraf@xxxxxxx>
L: qemu-ppc@xxxxxxxxxx
S: Supported
@@ -514,11 +526,13 @@ SPARC Machines
--------------
Sun4m
M: Blue Swirl <blauwirbel@xxxxxxxxx>
+M: Mark Cave-Ayland <mark.cave-ayland@xxxxxxxxxxxx>
S: Maintained
F: hw/sparc/sun4m.c
Sun4u
M: Blue Swirl <blauwirbel@xxxxxxxxx>
+M: Mark Cave-Ayland <mark.cave-ayland@xxxxxxxxxxxx>
S: Maintained
F: hw/sparc64/sun4u.c
@@ -534,6 +548,7 @@ S390 Virtio
M: Alexander Graf <agraf@xxxxxxx>
S: Maintained
F: hw/s390x/s390-*.c
+X: hw/s390x/*pci*.[hc]
S390 Virtio-ccw
M: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
@@ -544,6 +559,7 @@ F: hw/s390x/s390-virtio-ccw.c
F: hw/s390x/css.[hc]
F: hw/s390x/sclp*.[hc]
F: hw/s390x/ipl*.[hc]
+F: hw/s390x/*pci*.[hc]
F: include/hw/s390x/
F: pc-bios/s390-ccw/
T: git git://github.com/cohuck/qemu virtio-ccw-upstr
@@ -559,7 +575,6 @@ F: hw/unicore32/
X86 Machines
------------
PC
-M: Anthony Liguori <aliguori@xxxxxxxxxx>
M: Michael S. Tsirkin <mst@xxxxxxxxxx>
S: Supported
F: include/hw/i386/
@@ -593,12 +608,31 @@ F: hw/net/opencores_eth.c
Devices
-------
+EDU
+M: Jiri Slaby <jslaby@xxxxxxx>
+S: Maintained
+F: hw/misc/edu.c
+
IDE
-M: Kevin Wolf <kwolf@xxxxxxxxxx>
-M: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
-S: Odd Fixes
+M: John Snow <jsnow@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
F: include/hw/ide.h
F: hw/ide/
+F: hw/block/block.c
+F: hw/block/cdrom.c
+F: hw/block/hd-geometry.c
+F: tests/ide-test.c
+F: tests/ahci-test.c
+T: git git://github.com/jnsnow/qemu.git ide
+
+Floppy
+M: John Snow <jsnow@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: hw/block/fdc.c
+F: include/hw/block/fdc.h
+T: git git://github.com/jnsnow/qemu.git ide
OMAP
M: Peter Maydell <peter.maydell@xxxxxxxxxx>
@@ -610,7 +644,19 @@ M: Michael S. Tsirkin <mst@xxxxxxxxxx>
S: Supported
F: include/hw/pci/*
F: hw/pci/*
+
+ACPI
+M: Michael S. Tsirkin <mst@xxxxxxxxxx>
+M: Igor Mammedov <imammedo@xxxxxxxxxx>
+S: Supported
+F: include/hw/acpi/*
+F: hw/mem/*
F: hw/acpi/*
+F: hw/i386/acpi-build.[hc]
+F: hw/i386/*dsl
+F: hw/arm/virt-acpi-build.c
+F: include/hw/arm/virt-acpi-build.h
+F: scripts/acpi*py
ppc4xx
M: Alexander Graf <agraf@xxxxxxx>
@@ -657,7 +703,7 @@ F: hw/usb/dev-serial.c
VFIO
M: Alex Williamson <alex.williamson@xxxxxxxxxx>
S: Supported
-F: hw/misc/vfio.c
+F: hw/vfio/*
vhost
M: Michael S. Tsirkin <mst@xxxxxxxxxx>
@@ -665,10 +711,10 @@ S: Supported
F: hw/*/*vhost*
virtio
-M: Anthony Liguori <aliguori@xxxxxxxxxx>
M: Michael S. Tsirkin <mst@xxxxxxxxxx>
S: Supported
F: hw/*/virtio*
+F: net/vhost-user.c
virtio-9p
M: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
@@ -679,10 +725,13 @@ F: tests/virtio-9p-test.c
T: git git://github.com/kvaneesh/QEMU.git
virtio-blk
-M: Kevin Wolf <kwolf@xxxxxxxxxx>
M: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Supported
F: hw/block/virtio-blk.c
+F: hw/block/dataplane/*
+F: hw/virtio/dataplane/*
+T: git git://github.com/stefanha/qemu.git block
virtio-ccw
M: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
@@ -691,20 +740,36 @@ S: Supported
F: hw/s390x/virtio-ccw.[hc]
T: git git://github.com/cohuck/qemu virtio-ccw-upstr
+virtio-input
+M: Gerd Hoffmann <kraxel@xxxxxxxxxx>
+S: Maintained
+F: hw/input/virtio-input*.c
+F: include/hw/virtio/virtio-input.h
+
virtio-serial
M: Amit Shah <amit.shah@xxxxxxxxxx>
S: Supported
F: hw/char/virtio-serial-bus.c
F: hw/char/virtio-console.c
+F: include/hw/virtio/virtio-serial.h
+
+virtio-rng
+M: Amit Shah <amit.shah@xxxxxxxxxx>
+S: Supported
+F: hw/virtio/virtio-rng.c
+F: include/hw/virtio/virtio-rng.h
+F: backends/rng*.c
nvme
M: Keith Busch <keith.busch@xxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Supported
F: hw/block/nvme*
F: tests/nvme-test.c
megasas
M: Hannes Reinecke <hare@xxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Supported
F: hw/scsi/megasas.c
F: hw/scsi/mfi.h
@@ -722,10 +787,15 @@ S: Maintained
F: hw/net/vmxnet*
F: hw/scsi/vmw_pvscsi*
+Rocker
+M: Scott Feldman <sfeldma@xxxxxxxxx>
+M: Jiri Pirko <jiri@xxxxxxxxxxx>
+S: Maintained
+F: hw/net/rocker/
+
Subsystems
----------
Audio
-M: Vassili Karpov (malc) <av1474@xxxxxxxx>
M: Gerd Hoffmann <kraxel@xxxxxxxxxx>
S: Maintained
F: audio/
@@ -734,24 +804,50 @@ F: tests/ac97-test.c
F: tests/es1370-test.c
F: tests/intel-hda-test.c
-Block
+Block layer core
M: Kevin Wolf <kwolf@xxxxxxxxxx>
-M: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Supported
-F: async.c
-F: aio-*.c
F: block*
F: block/
F: hw/block/
+F: include/block/
F: qemu-img*
F: qemu-io*
-F: tests/image-fuzzer/
F: tests/qemu-iotests/
T: git git://repo.or.cz/qemu/kevin.git block
+
+Block I/O path
+M: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: async.c
+F: aio-*.c
+F: block/io.c
+F: migration/block*
T: git git://github.com/stefanha/qemu.git block
+Block Jobs
+M: Jeff Cody <jcody@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: blockjob.c
+F: include/block/blockjob.h
+F: block/backup.c
+F: block/commit.c
+F: block/stream.h
+F: block/mirror.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
+
+Block QAPI, monitor, command line
+M: Markus Armbruster <armbru@xxxxxxxxxx>
+S: Supported
+F: blockdev.c
+F: block/qapi.c
+F: qapi/block*.json
+T: git git://repo.or.cz/qemu/armbru.git block-next
+
Character Devices
-M: Anthony Liguori <aliguori@xxxxxxxxxx>
M: Paolo Bonzini <pbonzini@xxxxxxxxxx>
S: Maintained
F: qemu-char.c
@@ -763,6 +859,11 @@ M: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
S: Maintained
F: backends/baum.c
+Coverity model
+M: Markus Armbruster <armbru@xxxxxxxxxx>
+S: Supported
+F: scripts/coverity-model.c
+
CPU
M: Andreas Färber <afaerber@xxxxxxx>
S: Supported
@@ -807,7 +908,6 @@ F: audio/spiceaudio.c
F: hw/display/qxl*
Graphics
-M: Anthony Liguori <aliguori@xxxxxxxxxx>
M: Gerd Hoffmann <kraxel@xxxxxxxxxx>
S: Odd Fixes
F: ui/
@@ -819,7 +919,6 @@ S: Odd Fixes
F: ui/cocoa.m
Main loop
-M: Anthony Liguori <aliguori@xxxxxxxxxx>
M: Paolo Bonzini <pbonzini@xxxxxxxxxx>
S: Maintained
F: cpus.c
@@ -836,8 +935,8 @@ 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: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
+M: Jason Wang <jasowang@xxxxxxxxxx>
S: Maintained
F: net/
T: git git://github.com/stefanha/qemu.git net
@@ -858,21 +957,33 @@ F: nbd.*
F: qemu-nbd.c
T: git git://github.com/bonzini/qemu.git nbd-next
+NUMA
+M: Eduardo Habkost <ehabkost@xxxxxxxxxx>
+S: Maintained
+F: numa.c
+F: include/sysemu/numa.h
+K: numa|NUMA
+K: srat|SRAT
+T: git git://github.com/ehabkost/qemu.git numa
+
QAPI
-M: Luiz Capitulino <lcapitulino@xxxxxxxxxx>
+M: Markus Armbruster <armbru@xxxxxxxxxx>
M: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
-S: Maintained
+S: Supported
F: qapi/
+X: qapi/*.json
F: tests/qapi-schema/
-T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
+F: scripts/qapi*
+F: docs/qapi*
+T: git git://repo.or.cz/qemu/armbru.git qapi-next
QAPI Schema
M: Eric Blake <eblake@xxxxxxxxxx>
-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
+F: qapi/*.json
+T: git git://repo.or.cz/qemu/armbru.git qapi-next
QObject
M: Luiz Capitulino <lcapitulino@xxxxxxxxxx>
@@ -887,7 +998,6 @@ F: qga/
T: git git://github.com/mdroth/qemu.git qga
QOM
-M: Anthony Liguori <aliguori@xxxxxxxxxx>
M: Andreas Färber <afaerber@xxxxxxx>
S: Supported
T: git git://github.com/afaerber/qemu-cpu.git qom-next
@@ -898,13 +1008,14 @@ X: qom/cpu.c
F: tests/qom-test.c
QMP
-M: Luiz Capitulino <lcapitulino@xxxxxxxxxx>
-S: Maintained
+M: Markus Armbruster <armbru@xxxxxxxxxx>
+S: Supported
F: qmp.c
F: monitor.c
F: qmp-commands.hx
-F: QMP/
-T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
+F: docs/qmp/
+F: scripts/qmp/
+T: git git://repo.or.cz/qemu/armbru.git qapi-next
SLIRP
M: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
@@ -928,12 +1039,12 @@ F: scripts/checkpatch.pl
Migration
M: Juan Quintela <quintela@xxxxxxxxxx>
+M: Amit Shah <amit.shah@xxxxxxxxxx>
S: Maintained
F: include/migration/
-F: migration*
-F: savevm.c
-F: arch_init.c
-F: vmstate.c
+F: migration/
+F: scripts/vmstate-static-checker.py
+F: tests/vmstate-static-checker-data/
Seccomp
M: Eduardo Otubo <eduardo.otubo@xxxxxxxxxxxxxxxx>
@@ -941,6 +1052,13 @@ S: Supported
F: qemu-seccomp.c
F: include/sysemu/seccomp.h
+Cryptography
+M: Daniel P. Berrange <berrange@xxxxxxxxxx>
+S: Maintained
+F: crypto/
+F: include/crypto/
+F: tests/test-crypto-*
+
Usermode Emulation
------------------
Overall
@@ -1046,28 +1164,38 @@ Block drivers
-------------
VMDK
M: Fam Zheng <famz@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Supported
F: block/vmdk.c
RBD
-M: Josh Durgin <josh.durgin@xxxxxxxxxxx>
+M: Josh Durgin <jdurgin@xxxxxxxxxx>
+M: Jeff Cody <jcody@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Supported
F: block/rbd.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
Sheepdog
M: Hitoshi Mitake <mitake.hitoshi@xxxxxxxxxxxxx>
M: Liu Yuan <namei.unix@xxxxxxxxx>
+M: Jeff Cody <jcody@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
L: sheepdog@xxxxxxxxxxxxxx
S: Supported
F: block/sheepdog.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
VHDX
M: Jeff Cody <jcody@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Supported
F: block/vhdx*
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
VDI
M: Stefan Weil <sw@xxxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Maintained
F: block/vdi.c
@@ -1075,26 +1203,144 @@ iSCSI
M: Ronnie Sahlberg <ronniesahlberg@xxxxxxxxx>
M: Paolo Bonzini <pbonzini@xxxxxxxxxx>
M: Peter Lieven <pl@xxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Supported
F: block/iscsi.c
NFS
+M: Jeff Cody <jcody@xxxxxxxxxx>
M: Peter Lieven <pl@xxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Maintained
F: block/nfs.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
SSH
M: Richard W.M. Jones <rjones@xxxxxxxxxx>
+M: Jeff Cody <jcody@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Supported
F: block/ssh.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
ARCHIPELAGO
-M: Chrysostomos Nanakos <cnanakos@xxxxxxxx>
M: Chrysostomos Nanakos <chris@xxxxxxxxxx>
+M: Jeff Cody <jcody@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
S: Maintained
F: block/archipelago.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
+
+CURL
+M: Jeff Cody <jcody@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/curl.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
+
+GLUSTER
+M: Jeff Cody <jcody@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/gluster.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
+
+Null Block Driver
+M: Fam Zheng <famz@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/null.c
Bootdevice
M: Gonglei <arei.gonglei@xxxxxxxxxx>
S: Maintained
F: bootdevice.c
+
+Quorum
+M: Alberto Garcia <berto@xxxxxxxxxx>
+S: Supported
+F: block/quorum.c
+L: qemu-block@xxxxxxxxxx
+
+blkverify
+M: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/blkverify.c
+
+bochs
+M: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/bochs.c
+
+cloop
+M: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/cloop.c
+
+dmg
+M: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/dmg.c
+
+parallels
+M: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/parallels.c
+
+qed
+M: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/qed.c
+
+raw
+M: Kevin Wolf <kwolf@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/linux-aio.c
+F: block/raw-aio.h
+F: block/raw-posix.c
+F: block/raw-win32.c
+F: block/raw_bsd.c
+F: block/win32-aio.c
+
+qcow2
+M: Kevin Wolf <kwolf@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/qcow2*
+
+qcow
+M: Kevin Wolf <kwolf@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/qcow.c
+
+blkdebug
+M: Kevin Wolf <kwolf@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/blkdebug.c
+
+vpc
+M: Kevin Wolf <kwolf@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/vpc.c
+
+vvfat
+M: Kevin Wolf <kwolf@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: block/vvfat.c
+
+Image format fuzzer
+M: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
+L: qemu-block@xxxxxxxxxx
+S: Supported
+F: tests/image-fuzzer/
diff --git a/Makefile b/Makefile
index f505202..340d9c8 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,11 @@
# Always point to the root of the build tree (needs GNU make).
BUILD_DIR=$(CURDIR)
+# Before including a proper config-host.mak, assume we are in the source tree
+SRC_PATH=.
+
+UNCHECKED_GOALS := %clean TAGS cscope ctags
+
# All following code might depend on configuration variables
ifneq ($(wildcard config-host.mak),)
# Put the all: rule here so that config-host.mak can contain dependencies.
@@ -38,7 +43,7 @@ config-host.mak: $(SRC_PATH)/configure
fi
else
config-host.mak:
-ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
+ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if
$(MAKECMDGOALS),,fail))
@echo "Please call configure before running make!"
@exit 1
endif
@@ -74,7 +79,7 @@ Makefile: ;
configure: ;
.PHONY: all clean cscope distclean dvi html info install install-doc \
- pdf recurse-all speed test dist
+ pdf recurse-all speed test dist msi
$(call set-vpath, $(SRC_PATH))
@@ -84,6 +89,9 @@ 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-commands.txt
+ifdef CONFIG_LINUX
+DOCS+=kvm_stat.1
+endif
ifdef CONFIG_VIRTFS
DOCS+=fsdev/virtfs-proxy-helper.1
endif
@@ -109,8 +117,9 @@ endif
-include $(SUBDIR_DEVICES_MAK_DEP)
%/config-devices.mak: default-configs/%.mak
- $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh
$@ $<, " GEN $@")
- @if test -f $@; then \
+ $(call quiet-command, \
+ $(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $<
$*-config-devices.mak.d $@ > $@.tmp, " GEN $@.tmp")
+ $(call quiet-command, if test -f $@; then \
if cmp -s $@.old $@; then \
mv $@.tmp $@; \
cp -p $@ $@.old; \
@@ -126,7 +135,7 @@ endif
else \
mv $@.tmp $@; \
cp -p $@ $@.old; \
- fi
+ fi, " GEN $@");
defconfig:
rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
@@ -197,9 +206,9 @@ ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))
recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
-$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h |
$(BUILD_DIR)/version.lo
+$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc 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
+$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc config-host.h
$(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC
version.lo")
Makefile: $(version-obj-y) $(version-lobj-y)
@@ -239,17 +248,17 @@ qapi-py = $(SRC_PATH)/scripts/qapi.py
$(SRC_PATH)/scripts/ordereddict.py
qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\
$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \
- $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \
+ $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \
" GEN $@")
qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\
$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \
- $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \
+ $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \
" GEN $@")
qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c :\
$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py
$(qapi-py)
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \
- $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \
+ $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \
" GEN $@")
qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \
@@ -259,22 +268,22 @@ qapi-modules = $(SRC_PATH)/qapi-schema.json
$(SRC_PATH)/qapi/common.json \
qapi-types.c qapi-types.h :\
$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \
- $(gen-out-type) -o "." -b -i $<, \
+ $(gen-out-type) -o "." -b $<, \
" GEN $@")
qapi-visit.c qapi-visit.h :\
$(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \
- $(gen-out-type) -o "." -b -i $<, \
+ $(gen-out-type) -o "." -b $<, \
" GEN $@")
qapi-event.c qapi-event.h :\
$(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py)
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-event.py \
- $(gen-out-type) -o "." -b -i $<, \
+ $(gen-out-type) -o "." $<, \
" GEN $@")
qmp-commands.h qmp-marshal.c :\
$(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \
- $(gen-out-type) -o "." -m -i $<, \
+ $(gen-out-type) -o "." -m $<, \
" GEN $@")
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h
qga-qmp-commands.h)
@@ -283,15 +292,38 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
qemu-ga$(EXESUF): $(qga-obj-y) libqemuutil.a libqemustub.a
$(call LINK, $^)
+ifdef QEMU_GA_MSI_ENABLED
+QEMU_GA_MSI=qemu-ga-$(ARCH).msi
+
+msi: ${QEMU_GA_MSI}
+
+$(QEMU_GA_MSI): qemu-ga.exe
+
+ifdef QEMU_GA_MSI_WITH_VSS
+$(QEMU_GA_MSI): qga/vss-win32/qga-vss.dll
+endif
+
+$(QEMU_GA_MSI): config-host.mak
+
+$(QEMU_GA_MSI): qga/installer/qemu-ga.wxs
+ $(call quiet-command,QEMU_GA_VERSION="$(QEMU_GA_VERSION)"
QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)"
QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" \
+ wixl -o $@ $(QEMU_GA_MSI_ARCH) $(QEMU_GA_MSI_WITH_VSS)
$(QEMU_GA_MSI_MINGW_DLL_PATH) $<, " WIXL $@")
+else
+msi:
+ @echo MSI build not configured or dependency resolution failed
(reconfigure with --enable-guest-agent-msi option)
+endif
+
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
+ rm -f *.msi
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
+ rm -f ui/shader/*-vert.h ui/shader/*-frag.h
@# May not be present in GENERATED_HEADERS
rm -f trace/generated-tracers-dtrace.dtrace*
rm -f trace/generated-tracers-dtrace.h*
@@ -313,8 +345,8 @@ 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 config-all-devices.mak config-all-disas.mak config.status
+ rm -f po/*.mo tests/qemu-iotests/common.env
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
@@ -327,8 +359,8 @@ distclean: clean
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
+ 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 \
@@ -337,7 +369,7 @@ bepo cz
ifdef INSTALL_BLOBS
BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
-vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
+vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \
acpi-dsdt.aml q35-acpi-dsdt.aml \
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 \
@@ -384,13 +416,8 @@ ifneq (,$(findstring qemu-ga,$(TOOLS)))
endif
endif
-install-confdir:
- $(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)"
-install-sysconfig: install-datadir install-confdir
- $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf
"$(DESTDIR)$(qemu_confdir)"
-
-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
+install: all $(if $(BUILD_DOCS),install-doc) \
install-datadir install-localstatedir
ifneq ($(TOOLS),)
$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
@@ -427,15 +454,36 @@ endif
test speed: all
$(MAKE) -C tests/tcg $@
+.PHONY: ctags
+ctags:
+ rm -f $@
+ find "$(SRC_PATH)" -name '*.[hc]' -exec ctags --append {} +
+
.PHONY: TAGS
TAGS:
rm -f $@
find "$(SRC_PATH)" -name '*.[hc]' -exec etags --append {} +
cscope:
- rm -f ./cscope.*
- find "$(SRC_PATH)" -name "*.[chsS]" -print | sed 's,^\./,,' >
./cscope.files
- cscope -b
+ rm -f "$(SRC_PATH)"/cscope.*
+ find "$(SRC_PATH)/" -name "*.[chsS]" -print | sed 's,^\./,,' >
"$(SRC_PATH)/cscope.files"
+ cscope -b -i"$(SRC_PATH)/cscope.files"
+
+# opengl shader programs
+ui/shader/%-vert.h: $(SRC_PATH)/ui/shader/%.vert
$(SRC_PATH)/scripts/shaderinclude.pl
+ @mkdir -p $(dir $@)
+ $(call quiet-command,\
+ perl $(SRC_PATH)/scripts/shaderinclude.pl $< > $@,\
+ " VERT $@")
+
+ui/shader/%-frag.h: $(SRC_PATH)/ui/shader/%.frag
$(SRC_PATH)/scripts/shaderinclude.pl
+ @mkdir -p $(dir $@)
+ $(call quiet-command,\
+ perl $(SRC_PATH)/scripts/shaderinclude.pl $< > $@,\
+ " FRAG $@")
+
+ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \
+ ui/shader/texture-blit-vert.h ui/shader/texture-blit-frag.h
# documentation
MAKEINFO=makeinfo
@@ -490,6 +538,12 @@ qemu-nbd.8: qemu-nbd.texi
$(POD2MAN) --section=8 --center=" " --release=" " qemu-nbd.pod > $@, \
" GEN $@")
+kvm_stat.1: scripts/kvm/kvm_stat.texi
+ $(call quiet-command, \
+ perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< kvm_stat.pod && \
+ $(POD2MAN) --section=1 --center=" " --release=" " kvm_stat.pod > $@, \
+ " GEN $@")
+
dvi: qemu-doc.dvi qemu-tech.dvi
html: qemu-doc.html qemu-tech.html
info: qemu-doc.info qemu-tech.info
@@ -522,7 +576,7 @@ installer: $(INSTALLER)
INSTDIR=/tmp/qemu-nsis
$(INSTALLER): $(SRC_PATH)/qemu.nsi
- make install prefix=${INSTDIR}
+ $(MAKE) install prefix=${INSTDIR}
ifdef SIGNCODE
(cd ${INSTDIR}; \
for i in *.exe; do \
@@ -556,7 +610,7 @@ endif # CONFIG_WIN
# Add a dependency on the generated files, so that they are always
# rebuilt before other object files
-ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
+ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if
$(MAKECMDGOALS),,fail))
Makefile: $(GENERATED_HEADERS)
endif
diff --git a/Makefile.objs b/Makefile.objs
index 18fd35c..f094eff 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -2,6 +2,7 @@
# Common libraries for tools and emulators
stub-obj-y = stubs/
util-obj-y = util/ qobject/ qapi/ qapi-types.o qapi-visit.o qapi-event.o
+util-obj-y += crypto/
#######################################################################
# block-obj-y is code used by both qemu system emulation and qemu-img
@@ -48,15 +49,10 @@ 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 qemu-file-unix.o qemu-file-stdio.o
-common-obj-$(CONFIG_RDMA) += migration-rdma.o
+common-obj-y += migration/
common-obj-y += qemu-char.o #aio.o
-common-obj-y += block-migration.o
-common-obj-y += page_cache.o xbzrle.o
-
-common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
+common-obj-y += page_cache.o
+common-obj-y += qjson.o
common-obj-$(CONFIG_SPICE) += spice-qemu-char.o
@@ -81,6 +77,8 @@ common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
+common-obj-$(CONFIG_FDT) += device_tree.o
+
######################################################################
# qapi
diff --git a/Makefile.target b/Makefile.target
index e9ff1ee..3e7aafd 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -1,5 +1,7 @@
# -*- Mode: makefile -*-
+BUILD_DIR?=$(CURDIR)/..
+
include ../config-host.mak
include config-target.mak
include config-devices.mak
@@ -83,7 +85,7 @@ all: $(PROGS) stap
#########################################################
# cpu emulator library
obj-y = exec.o translate-all.o cpu-exec.o
-obj-y += tcg/tcg.o tcg/optimize.o
+obj-y += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o
obj-$(CONFIG_TCG_INTERPRETER) += tci.o
obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o
obj-y += fpu/softfloat.o
@@ -129,12 +131,12 @@ ifdef CONFIG_SOFTMMU
obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o
obj-y += qtest.o bootdevice.o
obj-y += hw/
-obj-$(CONFIG_FDT) += device_tree.o
obj-$(CONFIG_KVM) += kvm-all.o
-obj-y += memory.o savevm.o cputlb.o
+obj-y += memory.o cputlb.o
obj-y += memory_mapping.o
obj-y += dump.o
-LIBS+=$(libs_softmmu)
+obj-y += migration/ram.o migration/savevm.o
+LIBS := $(libs_softmmu) $(LIBS)
# xen support
obj-$(CONFIG_XEN) += xen-common.o
@@ -175,9 +177,15 @@ all-obj-y += $(common-obj-y)
all-obj-y += $(target-obj-y)
all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
+$(QEMU_PROG_BUILD): config-devices.mak
+
# build either PROG or PROGW
$(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
- $(call LINK,$^)
+ $(call LINK, $(filter-out %.mak, $^))
+ifdef CONFIG_DARWIN
+ $(call quiet-command,Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o $@,"
REZ $(TARGET_DIR)$@")
+ $(call quiet-command,SetFile -a C $@," SETFILE $(TARGET_DIR)$@")
+endif
gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
$(call quiet-command,rm -f $@ && $(SHELL)
$(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN
$(TARGET_DIR)$@")
diff --git a/VERSION b/VERSION
index c043eea..005119b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.1
+2.4.1
diff --git a/aio-posix.c b/aio-posix.c
_______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |