[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [qemu-xen master] Merge tag 'v2.9.0' into 'staging'



=== This changeset includes merge from high-traffic branch ===
Commits on that branch are not reported individually.

commit f7a5b150938c510eec28ad4b435ea6998cf09b8b
Merge: 359c41abe32638adad503e386969fa428cecff52 
414d069b38ab114b89085e44989bf57604ea86d7
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Wed Aug 2 15:47:27 2017 +0100
Commit:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
CommitDate: Wed Aug 2 15:47:27 2017 +0100

    Merge tag 'v2.9.0' into 'staging'
 .gitignore                                         |    38 +-
 .shippable.yml                                     |    21 +
 .travis.yml                                        |    57 +-
 CODING_STYLE                                       |     7 +
 HACKING                                            |    18 +
 MAINTAINERS                                        |   168 +-
 Makefile                                           |   306 +-
 Makefile.objs                                      |   113 +-
 Makefile.target                                    |    30 +-
 README                                             |     1 +
 VERSION                                            |     2 +-
 aio-posix.c                                        |   497 -
 aio-win32.c                                        |   376 -
 arch_init.c                                        |    50 +-
 async.c                                            |   402 -
 audio/audio.c                                      |    11 +-
 audio/audio.h                                      |     5 +
 audio/mixeng.c                                     |    32 +
 audio/sdlaudio.c                                   |    48 +
 backends/Makefile.objs                             |     2 +-
 backends/baum.c                                    |   128 +-
 backends/cryptodev-builtin.c                       |    81 +-
 backends/cryptodev.c                               |    34 +-
 backends/hostmem.c                                 |    52 +-
 backends/msmouse.c                                 |    72 +-
 backends/rng-egd.c                                 |     4 +-
 backends/testdev.c                                 |    48 +-
 backends/trace-events                              |    10 +
 backends/wctablet.c                                |   369 +
 balloon.c                                          |     2 +-
 block.c                                            |  1119 +-
 block/Makefile.objs                                |     9 +-
 block/archipelago.c                                |  1079 -
 block/backup.c                                     |    50 +-
 block/blkdebug.c                                   |    91 +-
 block/blkreplay.c                                  |     3 +-
 block/blkverify.c                                  |   202 +-
 block/block-backend.c                              |   203 +-
 block/bochs.c                                      |     7 +
 block/cloop.c                                      |     7 +
 block/commit.c                                     |   211 +-
 block/crypto.c                                     |     9 +-
 block/curl.c                                       |    70 +-
 block/dmg.c                                        |     7 +
 block/file-posix.c                                 |  2711 +++
 block/file-win32.c                                 |   781 +
 block/gluster.c                                    |   152 +-
 block/io.c                                         |   194 +-
 block/iscsi-opts.c                                 |    69 +
 block/iscsi.c                                      |   465 +-
 block/linux-aio.c                                  |    29 +-
 block/mirror.c                                     |   358 +-
 block/nbd-client.c                                 |   119 +-
 block/nbd-client.h                                 |     4 +-
 block/nbd.c                                        |    69 +-
 block/nfs.c                                        |   141 +-
 block/parallels.c                                  |    42 +-
 block/qapi.c                                       |   100 +-
 block/qcow.c                                       |    22 +-
 block/qcow2-cluster.c                              |    14 +-
 block/qcow2-refcount.c                             |    26 +-
 block/qcow2.c                                      |    42 +-
 block/qcow2.h                                      |     1 +
 block/qed-cluster.c                                |     2 +
 block/qed-table.c                                  |    12 +-
 block/qed.c                                        |    80 +-
 block/qed.h                                        |     3 +
 block/quorum.c                                     |   421 +-
 block/raw-format.c                                 |   497 +
 block/raw-posix.c                                  |  2616 ---
 block/raw-win32.c                                  |   781 -
 block/raw_bsd.c                                    |   490 -
 block/rbd.c                                        |   581 +-
 block/replication.c                                |    21 +-
 block/sheepdog.c                                   |   821 +-
 block/snapshot.c                                   |    26 +-
 block/ssh.c                                        |    41 +-
 block/stream.c                                     |    47 +-
 block/throttle-groups.c                            |     4 +-
 block/trace-events                                 |     6 +-
 block/vdi.c                                        |    18 +-
 block/vhdx-log.c                                   |     2 +-
 block/vhdx.c                                       |    29 +-
 block/vmdk.c                                       |    26 +-
 block/vpc.c                                        |    21 +-
 block/vvfat.c                                      |    76 +-
 block/win32-aio.c                                  |    13 +-
 blockdev-nbd.c                                     |     2 +-
 blockdev.c                                         |   199 +-
 blockjob.c                                         |   126 +-
 bsd-user/mmap.c                                    |    18 +-
 bsd-user/qemu.h                                    |     2 -
 chardev/Makefile.objs                              |    17 +
 chardev/char-console.c                             |    53 +
 chardev/char-fd.c                                  |   170 +
 chardev/char-fd.h                                  |    44 +
 chardev/char-file.c                                |   139 +
 chardev/char-io.c                                  |   192 +
 chardev/char-io.h                                  |    46 +
 chardev/char-mux.c                                 |   358 +
 chardev/char-mux.h                                 |    63 +
 chardev/char-null.c                                |    54 +
 chardev/char-parallel.c                            |   316 +
 chardev/char-parallel.h                            |    32 +
 chardev/char-pipe.c                                |   191 +
 chardev/char-pty.c                                 |   300 +
 chardev/char-ringbuf.c                             |   249 +
 chardev/char-serial.c                              |   318 +
 chardev/char-serial.h                              |    35 +
 chardev/char-socket.c                              |  1030 +
 chardev/char-stdio.c                               |   164 +
 chardev/char-udp.c                                 |   233 +
 chardev/char-win-stdio.c                           |   266 +
 chardev/char-win-stdio.h                           |    29 +
 chardev/char-win.c                                 |   265 +
 chardev/char-win.h                                 |    53 +
 chardev/char.c                                     |  1335 ++
 configure                                          |   231 +-
 contrib/libvhost-user/Makefile.objs                |     1 +
 contrib/libvhost-user/libvhost-user.c              |  1499 ++
 contrib/libvhost-user/libvhost-user.h              |   435 +
 cpu-exec-common.c                                  |     5 +-
 cpu-exec.c                                         |   247 +-
 cpus.c                                             |   706 +-
 cputlb.c                                           |   495 +-
 crypto/Makefile.objs                               |     4 +
 crypto/cipher-gcrypt.c                             |     6 +
 crypto/cipher-nettle.c                             |    42 +-
 crypto/cipher.c                                    |    15 +-
 crypto/hmac-gcrypt.c                               |   152 +
 crypto/hmac-glib.c                                 |   166 +
 crypto/hmac-nettle.c                               |   175 +
 crypto/hmac.c                                      |    72 +
 crypto/hmac.h                                      |   166 +
 crypto/ivgen-essiv.c                               |     1 +
 default-configs/alpha-softmmu.mak                  |     1 +
 default-configs/arm-softmmu.mak                    |     6 +
 default-configs/hppa-linux-user.mak                |     1 +
 default-configs/i386-softmmu.mak                   |     4 +
 default-configs/m68k-softmmu.mak                   |     2 -
 default-configs/mips-softmmu-common.mak            |     1 +
 default-configs/mips64el-softmmu.mak               |     3 +
 default-configs/moxie-softmmu.mak                  |     2 +
 default-configs/nios2-linux-user.mak               |     1 +
 default-configs/nios2-softmmu.mak                  |     6 +
 default-configs/or1k-linux-user.mak                |     1 +
 default-configs/or1k-softmmu.mak                   |     4 +
 default-configs/or32-linux-user.mak                |     1 -
 default-configs/or32-softmmu.mak                   |     4 -
 default-configs/pci.mak                            |     3 +
 default-configs/ppc-softmmu.mak                    |     3 +
 default-configs/ppc64-softmmu.mak                  |     2 +
 default-configs/ppcemb-softmmu.mak                 |     1 +
 default-configs/sh4-softmmu.mak                    |     1 +
 default-configs/sh4eb-softmmu.mak                  |     1 +
 default-configs/sparc-softmmu.mak                  |     1 +
 default-configs/sparc64-softmmu.mak                |     3 +
 default-configs/unicore32-softmmu.mak              |     1 +
 default-configs/x86_64-softmmu.mak                 |     4 +
 disas.c                                            |     3 +
 disas/Makefile.objs                                |     2 +
 disas/arm.c                                        |     4 +-
 disas/cris.c                                       |    14 +-
 disas/hppa.c                                       |  2831 +++
 disas/i386.c                                       |    14 +-
 disas/m68k.c                                       |    13 +-
 disas/microblaze.c                                 |     8 +-
 disas/nios2.c                                      |  3534 ++++
 disas/ppc.c                                        |    22 +-
 dma-helpers.c                                      |     4 +-
 docs/bootindex.txt                                 |     9 +
 docs/colo-proxy.txt                                |     4 +-
 docs/lockcnt.txt                                   |   277 +
 docs/mach-virt-graphical.cfg                       |   281 +
 docs/mach-virt-serial.cfg                          |   243 +
 docs/migration.txt                                 |    71 +
 docs/multi-thread-tcg.txt                          |   350 +
 docs/multiple-iothreads.txt                        |    13 +-
 docs/nvdimm.txt                                    |   124 +
 docs/pcie.txt                                      |    12 +-
 docs/q35-chipset.cfg                               |   152 -
 docs/q35-emulated.cfg                              |   288 +
 docs/q35-virtio-graphical.cfg                      |   248 +
 docs/q35-virtio-serial.cfg                         |   193 +
 docs/qapi-code-gen.txt                             |   307 +-
 docs/qdev-device-use.txt                           |     2 +-
 docs/qemu-ga-ref.texi                              |    80 +
 docs/qemu-qmp-ref.texi                             |    80 +
 docs/qemu_logo.pdf                                 |   Bin 0 -> 9117 bytes
 docs/qmp-commands.txt                              |  3824 ----
 docs/qmp-events.txt                                |   731 -
 docs/qmp-intro.txt                                 |     3 +-
 docs/replay.txt                                    |    37 +
 docs/specs/fw_cfg.txt                              |    36 +-
 docs/specs/pci-ids.txt                             |     4 +
 docs/specs/vhost-user.txt                          |    16 +
 docs/specs/vmgenid.txt                             |   245 +
 docs/tracing.txt                                   |    58 +-
 docs/usb-storage.txt                               |     2 +-
 docs/usb2.txt                                      |     2 +-
 docs/writing-qmp-commands.txt                      |     4 +-
 dtc                                                |     2 +-
 exec.c                                             |   900 +-
 fpu/softfloat-specialize.h                         |    22 +-
 fpu/softfloat.c                                    |   110 +-
 fsdev/Makefile.objs                                |     2 +-
 fsdev/file-op-9p.h                                 |     3 +
 fsdev/qemu-fsdev-opts.c                            |     3 +
 fsdev/qemu-fsdev-throttle.c                        |   118 +
 fsdev/qemu-fsdev-throttle.h                        |    39 +
 gdbstub.c                                          |   272 +-
 hax-stub.c                                         |    34 +
 hmp-commands-info.hx                               |    20 +-
 hmp.c                                              |    84 +-
 hmp.h                                              |     1 +
 hw/9pfs/9p-local.c                                 |  1045 +-
 hw/9pfs/9p-local.h                                 |    20 +
 hw/9pfs/9p-posix-acl.c                             |    44 +-
 hw/9pfs/9p-proxy.c                                 |    22 +-
 hw/9pfs/9p-util.c                                  |    69 +
 hw/9pfs/9p-util.h                                  |    60 +
 hw/9pfs/9p-xattr-user.c                            |    24 +-
 hw/9pfs/9p-xattr.c                                 |   167 +-
 hw/9pfs/9p-xattr.h                                 |    87 +-
 hw/9pfs/9p.c                                       |   175 +-
 hw/9pfs/9p.h                                       |    26 +-
 hw/9pfs/Makefile.objs                              |     2 +-
 hw/9pfs/cofile.c                                   |     2 +
 hw/9pfs/virtio-9p-device.c                         |    46 +-
 hw/9pfs/virtio-9p.h                                |    10 -
 hw/Makefile.objs                                   |     6 +-
 hw/acpi/Makefile.objs                              |    20 +-
 hw/acpi/acpi-stub.c                                |    29 +
 hw/acpi/aml-build.c                                |     2 +
 hw/acpi/bios-linker-loader.c                       |    66 +-
 hw/acpi/cpu.c                                      |     8 +-
 hw/acpi/cpu_hotplug.c                              |     4 +-
 hw/acpi/ich9.c                                     |     3 +-
 hw/acpi/ipmi-stub.c                                |    14 +
 hw/acpi/memory_hotplug.c                           |   420 +-
 hw/acpi/memory_hotplug_acpi_table.c                |   262 -
 hw/acpi/pcihp.c                                    |    11 -
 hw/acpi/piix4.c                                    |     5 +-
 hw/acpi/tco.c                                      |     3 +-
 hw/acpi/vmgenid.c                                  |   281 +
 hw/alpha/alpha_sys.h                               |     2 +-
 hw/alpha/dp264.c                                   |     1 +
 hw/arm/armv7m.c                                    |   387 +-
 hw/arm/aspeed.c                                    |   127 +-
 hw/arm/aspeed_soc.c                                |   108 +-
 hw/arm/bcm2835_peripherals.c                       |    58 +-
 hw/arm/cubieboard.c                                |     4 +
 hw/arm/exynos4210.c                                |    18 +
 hw/arm/fsl-imx25.c                                 |     2 +-
 hw/arm/fsl-imx31.c                                 |     2 +-
 hw/arm/fsl-imx6.c                                  |     2 +-
 hw/arm/highbank.c                                  |     8 +-
 hw/arm/imx25_pdk.c                                 |     2 +-
 hw/arm/integratorcp.c                              |    78 +-
 hw/arm/netduino2.c                                 |     7 +-
 hw/arm/nseries.c                                   |     2 +-
 hw/arm/omap2.c                                     |     2 +-
 hw/arm/pxa2xx.c                                    |    15 +-
 hw/arm/realview.c                                  |     3 +-
 hw/arm/spitz.c                                     |     3 +
 hw/arm/stellaris.c                                 |    48 +
 hw/arm/stm32f205_soc.c                             |    28 +-
 hw/arm/strongarm.h                                 |     2 +-
 hw/arm/tosa.c                                      |    12 +-
 hw/arm/versatilepb.c                               |     2 +-
 hw/arm/vexpress.c                                  |     2 +-
 hw/arm/virt-acpi-build.c                           |   172 +-
 hw/arm/virt.c                                      |   822 +-
 hw/arm/xilinx_zynq.c                               |     1 -
 hw/arm/xlnx-ep108.c                                |     6 +
 hw/arm/xlnx-zynqmp.c                               |     2 +
 hw/arm/z2.c                                        |    11 +-
 hw/audio/ac97.c                                    |    11 +
 hw/audio/es1370.c                                  |    20 +-
 hw/audio/marvell_88w8618.c                         |    18 +-
 hw/audio/pl041.c                                   |    25 +-
 hw/audio/wm8750.c                                  |     4 +-
 hw/block/Makefile.objs                             |     2 +-
 hw/block/block.c                                   |    24 +-
 hw/block/dataplane/trace-events                    |     5 +
 hw/block/dataplane/virtio-blk.c                    |     4 +-
 hw/block/fdc.c                                     |    28 +-
 hw/block/m25p80.c                                  |    93 +-
 hw/block/nand.c                                    |     7 +
 hw/block/nvme.c                                    |    10 +-
 hw/block/onenand.c                                 |     7 +
 hw/block/pflash_cfi01.c                            |    53 +-
 hw/block/pflash_cfi02.c                            |    32 +-
 hw/block/trace-events                              |     5 -
 hw/block/virtio-blk.c                              |    59 +-
 hw/block/xen_blkif.h                               |    21 +-
 hw/block/xen_disk.c                                |    25 +-
 hw/bt/hci-csr.c                                    |    64 +-
 hw/char/Makefile.objs                              |     5 +-
 hw/char/cadence_uart.c                             |    14 +-
 hw/char/escc.c                                     |     2 +-
 hw/char/exynos4210_uart.c                          |    26 +-
 hw/char/imx_serial.c                               |     2 +-
 hw/char/mcf_uart.c                                 |   102 +-
 hw/char/omap_uart.c                                |     6 +-
 hw/char/parallel.c                                 |     2 +-
 hw/char/serial-isa.c                               |     2 +-
 hw/char/serial.c                                   |    14 +-
 hw/char/sh_serial.c                                |     2 +-
 hw/char/spapr_vty.c                                |     2 +-
 hw/char/virtio-console.c                           |     2 +-
 hw/char/virtio-serial-bus.c                        |     4 +-
 hw/core/Makefile.objs                              |     5 +-
 hw/core/bus.c                                      |     2 +-
 hw/core/generic-loader.c                           |     4 +-
 hw/core/irq.c                                      |     1 +
 hw/core/loader-fit.c                               |   325 +
 hw/core/loader.c                                   |    42 +-
 hw/core/machine.c                                  |    75 +-
 hw/core/null-machine.c                             |    27 +-
 hw/core/or-irq.c                                   |     3 +
 hw/core/ptimer.c                                   |     9 +
 hw/core/qdev-properties-system.c                   |    17 +-
 hw/core/qdev-properties.c                          |     2 +-
 hw/core/qdev.c                                     |    30 +-
 hw/core/register.c                                 |    30 +-
 hw/core/reset.c                                    |    72 +
 hw/cpu/core.c                                      |     8 +
 hw/display/Makefile.objs                           |     8 +-
 hw/display/cirrus_vga.c                            |   142 +-
 hw/display/cirrus_vga_rop.h                        |   191 +-
 hw/display/cirrus_vga_rop2.h                       |   125 +-
 hw/display/framebuffer.c                           |     2 +-
 hw/display/g364fb.c                                |     2 +-
 hw/display/milkymist-tmu2.c                        |     6 +-
 hw/display/qxl.c                                   |    46 +-
 hw/display/qxl.h                                   |     1 +
 hw/display/sm501.c                                 |     2 +-
 hw/display/ssd0303.c                               |     4 +-
 hw/display/trace-events                            |    13 +-
 hw/display/vga.c                                   |    27 +-
 hw/display/virtio-gpu-3d.c                         |    34 +-
 hw/display/virtio-gpu.c                            |    83 +-
 hw/display/xlnx_dp.c                               |     4 +-
 hw/dma/omap_dma.c                                  |    10 +-
 hw/dma/pl330.c                                     |     8 +-
 hw/dma/rc4030.c                                    |   162 +-
 hw/gpio/Makefile.objs                              |     1 +
 hw/gpio/bcm2835_gpio.c                             |   353 +
 hw/gpio/max7310.c                                  |     4 +-
 hw/gpio/mpc8xxx.c                                  |    20 +-
 hw/i2c/core.c                                      |    37 +-
 hw/i2c/i2c-ddc.c                                   |     4 +-
 hw/i2c/imx_i2c.c                                   |     2 +-
 hw/i2c/smbus.c                                     |    13 +-
 hw/i386/acpi-build.c                               |   248 +-
 hw/i386/amd_iommu.c                                |     5 +-
 hw/i386/amd_iommu.h                                |     4 +-
 hw/i386/intel_iommu.c                              |   354 +-
 hw/i386/intel_iommu_internal.h                     |    14 +-
 hw/i386/kvm/apic.c                                 |     3 +-
 hw/i386/kvm/clock.c                                |   148 +-
 hw/i386/kvm/ioapic.c                               |    13 +-
 hw/i386/kvmvapic.c                                 |    17 +-
 hw/i386/multiboot.c                                |    20 +-
 hw/i386/pc.c                                       |   249 +-
 hw/i386/pc_piix.c                                  |    17 +-
 hw/i386/pc_q35.c                                   |    52 +-
 hw/i386/pci-assign-load-rom.c                      |    16 +-
 hw/i386/trace-events                               |    37 +-
 hw/i386/x86-iommu.c                                |    17 +
 hw/i386/xen/trace-events                           |     6 +
 hw/i386/xen/xen_platform.c                         |    51 +-
 hw/ide/ahci.c                                      |    14 +-
 hw/ide/core.c                                      |    27 +-
 hw/ide/piix.c                                      |     4 +-
 hw/ide/qdev.c                                      |    21 +-
 hw/input/lm832x.c                                  |     4 +-
 hw/input/ps2.c                                     |    18 +-
 hw/input/trace-events                              |     2 -
 hw/input/virtio-input.c                            |    33 +-
 hw/intc/Makefile.objs                              |     3 +-
 hw/intc/apic_common.c                              |     7 +-
 hw/intc/arm_gic.c                                  |    44 +-
 hw/intc/arm_gic_common.c                           |    29 +-
 hw/intc/arm_gic_kvm.c                              |    17 +-
 hw/intc/arm_gicv3.c                                |     5 +
 hw/intc/arm_gicv3_common.c                         |    72 +-
 hw/intc/arm_gicv3_cpuif.c                          |  1347 +-
 hw/intc/arm_gicv3_its_kvm.c                        |    20 +-
 hw/intc/arm_gicv3_kvm.c                            |   633 +-
 hw/intc/armv7m_nvic.c                              |  1021 +-
 hw/intc/exynos4210_gic.c                           |     2 +-
 hw/intc/gic_internal.h                             |     7 +-
 hw/intc/gicv3_internal.h                           |    82 +
 hw/intc/ioapic.c                                   |    30 +-
 hw/intc/ioapic_common.c                            |     3 +-
 hw/intc/mips_gic.c                                 |    56 +-
 hw/intc/nios2_iic.c                                |   100 +
 hw/intc/s390_flic.c                                |    28 +
 hw/intc/s390_flic_kvm.c                            |    16 +-
 hw/intc/trace-events                               |    56 +-
 hw/intc/xics.c                                     |   471 +-
 hw/intc/xics_kvm.c                                 |   199 +-
 hw/intc/xics_spapr.c                               |   128 +-
 hw/ipmi/isa_ipmi_bt.c                              |    40 +-
 hw/isa/Makefile.objs                               |     2 +-
 hw/isa/isa-bus.c                                   |     3 +-
 hw/isa/lpc_ich9.c                                  |    96 +-
 hw/isa/pc87312.c                                   |     2 +-
 hw/lm32/lm32.h                                     |     4 +-
 hw/lm32/lm32_hwsetup.h                             |     2 +-
 hw/lm32/milkymist-hw.h                             |     2 +-
 hw/m68k/Makefile.objs                              |     2 -
 hw/m68k/dummy_m68k.c                               |    84 -
 hw/m68k/mcf5208.c                                  |    31 +-
 hw/m68k/mcf_intc.c                                 |    48 +-
 hw/mips/Makefile.objs                              |     1 +
 hw/mips/boston.c                                   |   577 +
 hw/mips/mips_fulong2e.c                            |     1 +
 hw/mips/mips_jazz.c                                |     4 -
 hw/mips/mips_malta.c                               |     5 +-
 hw/mips/mips_r4k.c                                 |     1 +
 hw/misc/Makefile.objs                              |     5 +-
 hw/misc/aspeed_scu.c                               |     4 +-
 hw/misc/aspeed_sdmc.c                              |     3 +
 hw/misc/bcm2835_rng.c                              |   149 +
 hw/misc/exynos4210_clk.c                           |   164 +
 hw/misc/hyperv_testdev.c                           |     2 +-
 hw/misc/imx6_src.c                                 |    62 +-
 hw/misc/ivshmem.c                                  |    33 +-
 hw/misc/milkymist-pfpu.c                           |     2 +-
 hw/misc/mips_cmgcr.c                               |    17 +
 hw/misc/pvpanic.c                                  |     2 +-
 hw/misc/tmp105.c                                   |     3 +-
 hw/misc/unimp.c                                    |   107 +
 hw/misc/vmport.c                                   |     2 +-
 hw/net/Makefile.objs                               |     2 +-
 hw/net/cadence_gem.c                               |     4 +-
 hw/net/dp8393x.c                                   |    95 +-
 hw/net/e1000.c                                     |     2 +-
 hw/net/e1000e.c                                    |     9 +-
 hw/net/e1000e_core.c                               |     9 +-
 hw/net/fsl_etsec/etsec.c                           |     1 -
 hw/net/fsl_etsec/rings.c                           |    19 +-
 hw/net/imx_fec.c                                   |    10 +-
 hw/net/mcf_fec.c                                   |   186 +-
 hw/net/net_rx_pkt.c                                |    41 +-
 hw/net/rocker/rocker.c                             |     4 +-
 hw/net/rtl8139.c                                   |    34 +-
 hw/net/spapr_llan.c                                |    22 +-
 hw/net/stellaris_enet.c                            |     5 +-
 hw/net/trace-events                                |     8 -
 hw/net/vhost_net.c                                 |    19 +
 hw/net/virtio-net.c                                |   379 +-
 hw/net/vmxnet3.c                                   |   278 +-
 hw/nios2/10m50_devboard.c                          |   127 +
 hw/nios2/Makefile.objs                             |     1 +
 hw/nios2/boot.c                                    |   223 +
 hw/nios2/boot.h                                    |    11 +
 hw/nios2/cpu_pic.c                                 |    70 +
 hw/nvram/eeprom93xx.c                              |     8 +-
 hw/nvram/fw_cfg.c                                  |   118 +-
 hw/nvram/mac_nvram.c                               |     2 +-
 hw/nvram/spapr_nvram.c                             |    10 +-
 hw/openrisc/openrisc_sim.c                         |     4 +-
 hw/pci-bridge/Makefile.objs                        |     3 +-
 hw/pci-bridge/gen_pcie_root_port.c                 |    87 +
 hw/pci-bridge/ioh3420.c                            |   121 +-
 hw/pci-bridge/pci_bridge_dev.c                     |     2 +-
 hw/pci-bridge/pcie_root_port.c                     |   171 +
 hw/pci-bridge/xio3130_downstream.c                 |     6 +-
 hw/pci-bridge/xio3130_upstream.c                   |     6 +-
 hw/pci-host/Makefile.objs                          |     1 +
 hw/pci-host/prep.c                                 |    11 +-
 hw/pci-host/xilinx-pcie.c                          |   328 +
 hw/pci/msix.c                                      |    52 +-
 hw/pci/pci.c                                       |   115 +-
 hw/pci/pcie.c                                      |    60 +-
 hw/pci/pcie_aer.c                                  |    21 +-
 hw/pci/shpc.c                                      |     7 +-
 hw/ppc/Makefile.objs                               |     2 +
 hw/ppc/e500.c                                      |    23 +-
 hw/ppc/fdt.c                                       |     2 +-
 hw/ppc/mac_newworld.c                              |    16 +-
 hw/ppc/mac_oldworld.c                              |     1 +
 hw/ppc/pnv.c                                       |    11 +-
 hw/ppc/pnv_core.c                                  |     2 +-
 hw/ppc/pnv_lpc.c                                   |     2 +-
 hw/ppc/pnv_xscom.c                                 |     4 +-
 hw/ppc/ppc.c                                       |    89 +-
 hw/ppc/ppc405_uc.c                                 |     6 +-
 hw/ppc/ppc440_bamboo.c                             |     6 +
 hw/ppc/ppc4xx_pci.c                                |    13 +-
 hw/ppc/ppc_booke.c                                 |     8 +-
 hw/ppc/ppce500_spin.c                              |    22 +-
 hw/ppc/prep.c                                      |   235 +-
 hw/ppc/prep_systemio.c                             |   303 +
 hw/ppc/rs6000_mc.c                                 |   232 +
 hw/ppc/spapr.c                                     |   720 +-
 hw/ppc/spapr_cpu_core.c                            |   195 +-
 hw/ppc/spapr_drc.c                                 |    27 +-
 hw/ppc/spapr_events.c                              |    10 +-
 hw/ppc/spapr_hcall.c                               |   251 +-
 hw/ppc/spapr_ovec.c                                |    19 +-
 hw/ppc/spapr_pci.c                                 |   318 +-
 hw/ppc/spapr_rtas.c                                |     3 +-
 hw/ppc/spapr_vio.c                                 |    12 +-
 hw/ppc/trace-events                                |    25 +-
 hw/ppc/virtex_ml507.c                              |     7 +
 hw/s390x/css.c                                     |    30 +-
 hw/s390x/ipl.c                                     |    90 +
 hw/s390x/ipl.h                                     |     5 +-
 hw/s390x/s390-pci-bus.c                            |   361 +-
 hw/s390x/s390-pci-bus.h                            |    54 +-
 hw/s390x/s390-pci-inst.c                           |    75 +-
 hw/s390x/s390-pci-inst.h                           |     2 +-
 hw/s390x/s390-virtio-ccw.c                         |    29 +-
 hw/s390x/s390-virtio.c                             |    14 +-
 hw/s390x/s390-virtio.h                             |     1 +
 hw/s390x/virtio-ccw.c                              |   115 +-
 hw/s390x/virtio-ccw.h                              |    13 +
 hw/scsi/esp-pci.c                                  |     3 -
 hw/scsi/esp.c                                      |     6 -
 hw/scsi/lsi53c895a.c                               |    10 +-
 hw/scsi/megasas.c                                  |    27 +-
 hw/scsi/mptsas.c                                   |    10 +-
 hw/scsi/scsi-bus.c                                 |    66 +-
 hw/scsi/scsi-disk.c                                |    39 +-
 hw/scsi/scsi-generic.c                             |    30 +-
 hw/scsi/spapr_vscsi.c                              |     5 +-
 hw/scsi/vhost-scsi.c                               |    25 +-
 hw/scsi/virtio-scsi-dataplane.c                    |    28 +-
 hw/scsi/virtio-scsi.c                              |    91 +-
 hw/scsi/vmw_pvscsi.c                               |     2 +-
 hw/sd/Makefile.objs                                |     1 +
 hw/sd/bcm2835_sdhost.c                             |   429 +
 hw/sd/core.c                                       |    27 +
 hw/sd/sd.c                                         |     8 +-
 hw/sd/sdhci.c                                      |    29 +-
 hw/sh4/r2d.c                                       |     1 +
 hw/sh4/sh7750.c                                    |     2 +-
 hw/sh4/shix.c                                      |     2 +-
 hw/smbios/Makefile.objs                            |    12 +-
 hw/smbios/smbios-stub.c                            |    31 +
 hw/smbios/smbios.c                                 |     2 +-
 hw/smbios/smbios_type_38-stub.c                    |    14 +
 hw/sparc/sun4m.c                                   |     8 +-
 hw/sparc64/Makefile.objs                           |     2 +
 hw/sparc64/niagara.c                               |   190 +
 hw/sparc64/sparc64.c                               |   381 +
 hw/sparc64/sun4u.c                                 |   381 +-
 hw/ssi/aspeed_smc.c                                |   366 +-
 hw/ssi/imx_spi.c                                   |    11 +-
 hw/timer/Makefile.objs                             |     7 +
 hw/timer/altera_timer.c                            |   237 +
 hw/timer/armv7m_systick.c                          |   240 +
 hw/timer/ds1338.c                                  |    10 +-
 hw/timer/imx_gpt.c                                 |    33 +-
 hw/timer/m48t59-internal.h                         |    82 +
 hw/timer/m48t59-isa.c                              |   181 +
 hw/timer/m48t59.c                                  |   230 +-
 hw/timer/mc146818rtc.c                             |    27 +-
 hw/timer/mips_gictimer.c                           |     5 +
 hw/timer/sun4v-rtc.c                               |   102 +
 hw/timer/trace-events                              |     6 +
 hw/timer/twl92230.c                                |    12 +-
 hw/usb/Makefile.objs                               |     2 +-
 hw/usb/bus.c                                       |     9 +-
 hw/usb/ccid-card-emulated.c                        |     2 +-
 hw/usb/ccid-card-passthru.c                        |     2 +-
 hw/usb/desc.c                                      |     7 +
 hw/usb/dev-audio.c                                 |     4 +-
 hw/usb/dev-bluetooth.c                             |     4 +-
 hw/usb/dev-hid.c                                   |    10 +-
 hw/usb/dev-hub.c                                   |     4 +-
 hw/usb/dev-mtp.c                                   |     4 +-
 hw/usb/dev-network.c                               |     4 +-
 hw/usb/dev-serial.c                                |     6 +-
 hw/usb/dev-smartcard-reader.c                      |   142 +-
 hw/usb/dev-storage.c                               |    22 +-
 hw/usb/dev-uas.c                                   |     9 +-
 hw/usb/dev-wacom.c                                 |     4 +-
 hw/usb/hcd-ehci-pci.c                              |     9 +
 hw/usb/hcd-ehci.c                                  |     5 +
 hw/usb/hcd-ehci.h                                  |     1 +
 hw/usb/hcd-ohci.c                                  |    13 +-
 hw/usb/hcd-xhci.c                                  |   365 +-
 hw/usb/host-libusb.c                               |    40 +-
 hw/usb/host-stub.c                                 |     5 +
 hw/usb/redirect.c                                  |    34 +-
 hw/usb/trace-events                                |     2 +-
 hw/vfio/Makefile.objs                              |     4 +-
 hw/vfio/common.c                                   |    65 +-
 hw/vfio/pci-quirks.c                               |    10 +-
 hw/vfio/pci.c                                      |    45 +-
 hw/vfio/trace-events                               |     4 +-
 hw/virtio/Makefile.objs                            |     6 +-
 hw/virtio/trace-events                             |     2 +
 hw/virtio/vhost-backend.c                          |    99 +
 hw/virtio/vhost-stub.c                             |     7 +
 hw/virtio/vhost-user.c                             |    34 +
 hw/virtio/vhost.c                                  |   222 +-
 hw/virtio/virtio-balloon.c                         |     7 +-
 hw/virtio/virtio-bus.c                             |    29 +-
 hw/virtio/virtio-crypto-pci.c                      |     6 +-
 hw/virtio/virtio-crypto.c                          |    43 +-
 hw/virtio/virtio-mmio.c                            |    97 +-
 hw/virtio/virtio-pci.c                             |    71 +-
 hw/virtio/virtio-pci.h                             |    16 +
 hw/virtio/virtio.c                                 |   653 +-
 hw/watchdog/Makefile.objs                          |     1 +
 hw/watchdog/wdt_aspeed.c                           |   225 +
 hw/watchdog/wdt_i6300esb.c                         |     9 +
 hw/xen/Makefile.objs                               |     2 +-
 hw/xen/trace-events                                |    13 +
 hw/xen/xen_backend.c                               |    13 +-
 hw/xtensa/pic_cpu.c                                |    75 +-
 hw/xtensa/sim.c                                    |    40 +-
 hw/xtensa/xtfpga.c                                 |     9 +
 include/block/aio.h                                |   132 +-
 include/block/block.h                              |   102 +-
 include/block/block_int.h                          |   191 +-
 include/block/blockjob.h                           |    14 +-
 include/block/blockjob_int.h                       |     4 +-
 include/disas/bfd.h                                |    13 +
 include/elf.h                                      |     2 +
 include/exec/cpu-all.h                             |    23 +
 include/exec/cpu-common.h                          |    24 +-
 include/exec/cpu_ldst_template.h                   |     2 +-
 include/exec/cpu_ldst_useronly_template.h          |     2 +-
 include/exec/cputlb.h                              |     2 -
 include/exec/exec-all.h                            |   147 +-
 include/exec/gen-icount.h                          |    53 +-
 include/exec/memory.h                              |   200 +-
 include/exec/ram_addr.h                            |    52 +-
 include/exec/ramlist.h                             |    72 +
 include/fpu/softfloat.h                            |    25 +
 include/glib-compat.h                              |    23 +-
 include/hw/acpi/acpi-defs.h                        |    45 +-
 include/hw/acpi/acpi_dev_interface.h               |     3 +-
 include/hw/acpi/aml-build.h                        |     1 +
 include/hw/acpi/bios-linker-loader.h               |     7 +
 include/hw/acpi/memory_hotplug.h                   |    12 +-
 include/hw/acpi/pc-hotplug.h                       |    23 -
 include/hw/acpi/vmgenid.h                          |    37 +
 include/hw/arm/arm.h                               |    14 +-
 include/hw/arm/armv7m.h                            |    63 +
 include/hw/arm/armv7m_nvic.h                       |    62 +
 include/hw/arm/aspeed_soc.h                        |     6 +-
 include/hw/arm/bcm2835_peripherals.h               |     6 +
 include/hw/arm/exynos4210.h                        |     4 +-
 include/hw/arm/omap.h                              |     8 +-
 include/hw/arm/pxa.h                               |     2 +-
 include/hw/arm/stm32f205_soc.h                     |     4 +-
 include/hw/arm/virt-acpi-build.h                   |    47 -
 include/hw/arm/virt.h                              |    45 +-
 include/hw/block/block.h                           |     8 +-
 include/hw/boards.h                                |    19 +-
 include/hw/bt.h                                    |     4 +-
 include/hw/char/cadence_uart.h                     |     2 +-
 include/hw/char/escc.h                             |     2 +-
 include/hw/char/pl011.h                            |     4 +-
 include/hw/char/serial.h                           |     4 +-
 include/hw/char/xilinx_uartlite.h                  |     2 +-
 include/hw/compat.h                                |    47 +
 include/hw/cris/etraxfs.h                          |     2 +-
 include/hw/devices.h                               |     2 +-
 include/hw/dma/xlnx_dpdma.h                        |     3 +-
 include/hw/elf_ops.h                               |    13 +-
 include/hw/gpio/bcm2835_gpio.h                     |    39 +
 include/hw/hw.h                                    |     6 +-
 include/hw/i2c/i2c.h                               |    16 +-
 include/hw/i386/ich9.h                             |    14 +-
 include/hw/i386/intel_iommu.h                      |     2 +
 include/hw/i386/pc.h                               |    37 +-
 include/hw/i386/x86-iommu.h                        |     1 +
 include/hw/ide.h                                   |     2 +-
 include/hw/ide/internal.h                          |     1 +
 include/hw/input/ps2.h                             |     6 +
 include/hw/intc/arm_gic_common.h                   |     2 +
 include/hw/intc/arm_gicv3_common.h                 |    22 +
 include/hw/loader-fit.h                            |    41 +
 include/hw/loader.h                                |    26 +-
 include/hw/m68k/mcf.h                              |    14 +-
 include/hw/m68k/mcf_fec.h                          |    13 +
 include/hw/mips/cpudevs.h                          |     2 +-
 include/hw/misc/aspeed_scu.h                       |     1 +
 include/hw/misc/bcm2835_rng.h                      |    27 +
 include/hw/misc/mips_cmgcr.h                       |     3 +
 include/hw/misc/unimp.h                            |    39 +
 include/hw/nvram/fw_cfg.h                          |     3 +-
 include/hw/nvram/fw_cfg_keys.h                     |     3 +-
 include/hw/pci-host/q35.h                          |     2 +-
 include/hw/pci-host/spapr.h                        |     4 +-
 include/hw/pci-host/xilinx-pcie.h                  |    68 +
 include/hw/pci/msix.h                              |     5 +-
 include/hw/pci/pci.h                               |    11 +
 include/hw/pci/pci_ids.h                           |   112 +-
 include/hw/pci/pcie.h                              |    19 +-
 include/hw/pci/pcie_aer.h                          |     4 +-
 include/hw/pci/pcie_port.h                         |    19 +
 include/hw/ppc/fdt.h                               |     2 +-
 include/hw/ppc/ppc.h                               |     2 +-
 include/hw/ppc/spapr.h                             |    15 +-
 include/hw/ppc/spapr_cpu_core.h                    |     8 +-
 include/hw/ppc/spapr_drc.h                         |     1 +
 include/hw/ppc/spapr_vio.h                         |     4 +-
 include/hw/ppc/xics.h                              |    97 +-
 include/hw/ptimer.h                                |     1 +
 include/hw/qdev-core.h                             |     1 +
 include/hw/qdev-properties.h                       |     2 +-
 include/hw/register.h                              |    49 +-
 include/hw/registerfields.h                        |    60 +
 include/hw/s390x/s390_flic.h                       |    11 +-
 include/hw/scsi/scsi.h                             |     3 +-
 include/hw/sd/bcm2835_sdhost.h                     |    48 +
 include/hw/sd/sd.h                                 |    11 +
 include/hw/sh4/sh.h                                |     4 +-
 include/hw/smbios/smbios.h                         |     2 +-
 include/hw/sparc/grlib.h                           |     2 +-
 include/hw/sparc/sparc64.h                         |     5 +
 include/hw/ssi/aspeed_smc.h                        |     4 +-
 include/hw/timer/armv7m_systick.h                  |    34 +
 include/hw/timer/mips_gictimer.h                   |     1 +
 include/hw/timer/sun4v-rtc.h                       |     1 +
 include/hw/usb.h                                   |     8 +-
 include/hw/virtio/vhost-backend.h                  |    15 +
 include/hw/virtio/vhost.h                          |    15 +
 include/hw/virtio/virtio-access.h                  |    83 +-
 include/hw/virtio/virtio-blk.h                     |     2 +-
 include/hw/virtio/virtio-bus.h                     |     1 +
 include/hw/virtio/virtio-gpu.h                     |     3 +
 include/hw/virtio/virtio-input.h                   |     5 +-
 include/hw/virtio/virtio-net.h                     |     5 +-
 include/hw/virtio/virtio-scsi.h                    |    20 +-
 include/hw/virtio/virtio.h                         |    20 +-
 include/hw/watchdog/wdt_aspeed.h                   |    32 +
 include/hw/xen/xen.h                               |     2 +-
 include/hw/xen/xen_common.h                        |     2 +-
 include/io/channel.h                               |    72 +-
 include/io/dns-resolver.h                          |   228 +
 include/io/task.h                                  |   154 +-
 include/migration/colo.h                           |     2 +
 include/migration/migration.h                      |    30 +-
 include/migration/postcopy-ram.h                   |    13 +-
 include/migration/qemu-file.h                      |     3 +-
 include/migration/vmstate.h                        |   108 +-
 include/monitor/monitor.h                          |     3 +-
 include/net/eth.h                                  |     4 +-
 include/net/vhost_net.h                            |     2 +
 include/qapi/dealloc-visitor.h                     |     2 +-
 include/qapi/error.h                               |     3 +
 include/qapi/qmp/dispatch.h                        |    22 +-
 include/qapi/qmp/qerror.h                          |     9 -
 include/qapi/qmp/qjson.h                           |     5 +-
 include/qapi/qobject-input-visitor.h               |    61 +-
 include/qapi/qobject-output-visitor.h              |    35 +-
 include/qapi/util.h                                |     2 +
 include/qapi/visitor-impl.h                        |     7 +-
 include/qapi/visitor.h                             |    19 +-
 include/qemu-common.h                              |     2 +-
 include/qemu-io.h                                  |     1 +
 include/qemu/compatfd.h                            |    42 -
 include/qemu/compiler.h                            |    16 +-
 include/qemu/config-file.h                         |     4 -
 include/qemu/coroutine.h                           |    95 +-
 include/qemu/coroutine_int.h                       |    11 +-
 include/qemu/cutils.h                              |    29 +-
 include/qemu/event_notifier.h                      |     3 -
 include/qemu/futex.h                               |    36 +
 include/qemu/hbitmap.h                             |    13 +
 include/qemu/host-utils.h                          |    52 +-
 include/qemu/main-loop.h                           |    19 +-
 include/qemu/mmap-alloc.h                          |     2 +
 include/qemu/module.h                              |     2 -
 include/qemu/option.h                              |    12 +
 include/qemu/osdep.h                               |    49 +-
 include/qemu/qht.h                                 |     2 +-
 include/qemu/queue.h                               |    60 +
 include/qemu/sockets.h                             |    13 +
 include/qemu/systemd.h                             |    26 +
 include/qemu/thread-win32.h                        |     7 +-
 include/qemu/thread.h                              |   112 +
 include/qemu/throttle-options.h                    |    92 +
 include/qemu/timer.h                               |    37 +-
 include/qemu/typedefs.h                            |     3 +-
 include/qemu/xattr.h                               |     2 +-
 include/qom/cpu.h                                  |    50 +-
 include/qom/object.h                               |    26 +-
 include/qom/object_interfaces.h                    |    17 -
 include/standard-headers/asm-x86/hyperv.h          |     8 +
 include/standard-headers/linux/input-event-codes.h |     2 +-
 include/standard-headers/linux/input.h             |     1 +
 include/standard-headers/linux/pci_regs.h          |    40 +-
 include/standard-headers/linux/virtio_crypto.h     |   481 +-
 include/standard-headers/linux/virtio_ids.h        |     1 +
 include/standard-headers/linux/virtio_mmio.h       |   141 +
 include/sysemu/arch_init.h                         |     3 +-
 include/sysemu/block-backend.h                     |    31 +-
 include/sysemu/blockdev.h                          |    11 +-
 include/sysemu/char.h                              |   202 +-
 include/sysemu/cpus.h                              |     5 +
 include/sysemu/cryptodev.h                         |    42 +
 include/sysemu/hax.h                               |    56 +
 include/sysemu/hostmem.h                           |     1 +
 include/sysemu/hw_accel.h                          |    48 +
 include/sysemu/iothread.h                          |     5 +
 include/sysemu/kvm.h                               |    32 +-
 include/sysemu/numa.h                              |     2 +-
 include/sysemu/replay.h                            |    32 +-
 include/sysemu/reset.h                             |    10 +
 include/sysemu/sysemu.h                            |    17 +-
 include/trace.h                                    |     6 -
 include/ui/console.h                               |    30 +-
 include/ui/egl-helpers.h                           |     3 +-
 include/ui/gtk.h                                   |    31 +-
 include/ui/qemu-spice.h                            |     2 +-
 include/ui/sdl2.h                                  |    13 +-
 io/Makefile.objs                                   |     1 +
 io/channel-command.c                               |    13 +
 io/channel-file.c                                  |    11 +
 io/channel-socket.c                                |    68 +-
 io/channel-tls.c                                   |    28 +-
 io/channel-watch.c                                 |     6 +
 io/channel-websock.c                               |   272 +-
 io/channel.c                                       |    97 +-
 io/dns-resolver.c                                  |   276 +
 io/task.c                                          |    63 +-
 io/trace-events                                    |     1 -
 iohandler.c                                        |   128 -
 ioport.c                                           |     2 +-
 iothread.c                                         |   101 +
 kvm-all.c                                          |   156 +-
 kvm-stub.c                                         |    12 +-
 linux-headers/asm-arm/kvm.h                        |    22 +
 linux-headers/asm-arm/unistd-common.h              |   357 +
 linux-headers/asm-arm/unistd-eabi.h                |     5 +
 linux-headers/asm-arm/unistd-oabi.h                |    17 +
 linux-headers/asm-arm/unistd.h                     |   419 +-
 linux-headers/asm-arm64/kvm.h                      |    13 +
 linux-headers/asm-powerpc/kvm.h                    |    27 +
 linux-headers/asm-powerpc/unistd.h                 |     1 +
 linux-headers/asm-x86/kvm_para.h                   |    13 +-
 linux-headers/asm-x86/unistd_32.h                  |     3 +
 linux-headers/asm-x86/unistd_64.h                  |     3 +
 linux-headers/asm-x86/unistd_x32.h                 |     3 +
 linux-headers/linux/kvm.h                          |    31 +-
 linux-headers/linux/kvm_para.h                     |     2 +
 linux-headers/linux/userfaultfd.h                  |    67 +-
 linux-headers/linux/vfio.h                         |    10 +
 linux-headers/linux/vhost.h                        |     2 -
 linux-user/alpha/target_syscall.h                  |     2 +
 linux-user/elfload.c                               |   341 +-
 linux-user/errno_defs.h                            |     3 +
 linux-user/host/s390x/safe-syscall.inc.S           |     2 +-
 linux-user/hppa/sockbits.h                         |    97 +
 linux-user/hppa/syscall_nr.h                       |   353 +
 linux-user/hppa/target_cpu.h                       |    35 +
 linux-user/hppa/target_signal.h                    |    29 +
 linux-user/hppa/target_structs.h                   |    54 +
 linux-user/hppa/target_syscall.h                   |   237 +
 linux-user/hppa/termbits.h                         |   219 +
 linux-user/ioctls.h                                |    13 +
 linux-user/m68k/syscall_nr.h                       |     3 +
 linux-user/main.c                                  |   439 +-
 linux-user/mips/target_syscall.h                   |     5 +
 linux-user/mips64/target_syscall.h                 |     5 +
 linux-user/mmap.c                                  |     9 +-
 linux-user/nios2/syscall_nr.h                      |   329 +
 linux-user/nios2/target_cpu.h                      |    39 +
 linux-user/nios2/target_signal.h                   |    26 +
 linux-user/nios2/target_structs.h                  |    58 +
 linux-user/nios2/target_syscall.h                  |    37 +
 linux-user/nios2/termbits.h                        |   220 +
 linux-user/openrisc/target_cpu.h                   |     4 +-
 linux-user/openrisc/target_syscall.h               |     2 +
 linux-user/qemu.h                                  |     3 +
 linux-user/sh4/syscall_nr.h                        |    14 +
 linux-user/signal.c                                |   715 +-
 linux-user/socket.h                                |     2 +
 linux-user/strace.c                                |     2 -
 linux-user/syscall.c                               |   187 +-
 linux-user/syscall_defs.h                          |   172 +-
 linux-user/syscall_types.h                         |    12 +
 main-loop.c                                        |   574 -
 memory.c                                           |   147 +-
 memory_ldst.inc.c                                  |   709 +
 migration/Makefile.objs                            |     3 +-
 migration/block.c                                  |    26 +-
 migration/colo.c                                   |   151 +-
 migration/migration.c                              |   188 +-
 migration/postcopy-ram.c                           |   146 +-
 migration/qemu-file.c                              |    59 +-
 migration/ram.c                                    |   217 +-
 migration/savevm.c                                 |   141 +-
 migration/socket.c                                 |    11 +-
 migration/tls.c                                    |    21 +-
 migration/trace-events                             |    17 +-
 migration/vmstate.c                                |   336 +-
 monitor.c                                          |   264 +-
 nbd/client.c                                       |     6 +-
 nbd/common.c                                       |    17 +-
 nbd/nbd-internal.h                                 |     3 +-
 nbd/server.c                                       |   111 +-
 net/Makefile.objs                                  |     1 +
 net/checksum.c                                     |    21 +-
 net/colo-compare.c                                 |   245 +-
 net/colo.c                                         |     4 +-
 net/eth.c                                          |    25 +-
 net/filter-mirror.c                                |    11 +-
 net/filter-replay.c                                |    92 +
 net/filter-rewriter.c                              |    17 +-
 net/net.c                                          |    50 +-
 net/slirp.c                                        |     2 +-
 net/tap.c                                          |     8 +-
 net/vhost-user.c                                   |    66 +-
 numa.c                                             |    63 +-
 pc-bios/README                                     |     2 +-
 pc-bios/bios-256k.bin                              |   Bin 262144 -> 262144 
bytes
 pc-bios/bios.bin                                   |   Bin 131072 -> 131072 
bytes
 pc-bios/openbios-ppc                               |   Bin 750840 -> 750840 
bytes
 pc-bios/openbios-sparc32                           |   Bin 382048 -> 382048 
bytes
 pc-bios/openbios-sparc64                           |   Bin 1593408 -> 1593408 
bytes
 pc-bios/s390-ccw.img                               |   Bin 26392 -> 26456 bytes
 pc-bios/s390-ccw/bootmap.c                         |     8 +-
 pc-bios/s390-ccw/iplb.h                            |     3 +-
 pc-bios/s390-ccw/main.c                            |    20 +-
 pc-bios/s390-ccw/virtio.c                          |     1 +
 pc-bios/s390-ccw/virtio.h                          |     1 +
 pc-bios/slof.bin                                   |   Bin 898232 -> 902120 
bytes
 pc-bios/vgabios-cirrus.bin                         |   Bin 38400 -> 38400 bytes
 pc-bios/vgabios-qxl.bin                            |   Bin 38912 -> 38912 bytes
 pc-bios/vgabios-stdvga.bin                         |   Bin 38912 -> 38912 bytes
 pc-bios/vgabios-virtio.bin                         |   Bin 38912 -> 38912 bytes
 pc-bios/vgabios-vmware.bin                         |   Bin 38912 -> 38912 bytes
 pc-bios/vgabios.bin                                |   Bin 38400 -> 38400 bytes
 qapi-schema.json                                   |  2016 +-
 qapi/block-core.json                               |  1479 +-
 qapi/block.json                                    |    72 +-
 qapi/common.json                                   |    38 +-
 qapi/crypto.json                                   |    30 +-
 qapi/event.json                                    |   260 +-
 qapi/introspect.json                               |    11 +-
 qapi/opts-visitor.c                                |    25 +-
 qapi/qapi-util.c                                   |    47 +
 qapi/qapi-visit-core.c                             |     9 +
 qapi/qmp-dispatch.c                                |    34 +-
 qapi/qmp-registry.c                                |    37 +-
 qapi/qobject-input-visitor.c                       |   419 +-
 qapi/rocker.json                                   |   149 +-
 qapi/string-input-visitor.c                        |   101 +-
 qapi/trace-events                                  |     3 +-
 qapi/trace.json                                    |    23 +-
 qdev-monitor.c                                     |     1 +
 qemu-char.c                                        |  4956 -----
 qemu-doc.texi                                      |    19 +-
 qemu-img-cmds.hx                                   |     8 +-
 qemu-img.c                                         |   663 +-
 qemu-img.texi                                      |    16 +-
 qemu-io-cmds.c                                     |    73 +-
 qemu-io.c                                          |     8 +-
 qemu-nbd.c                                         |    88 +-
 qemu-option-trace.texi                             |     4 +-
 qemu-options-wrapper.h                             |     2 +-
 qemu-options.hx                                    |   184 +-
 qemu-timer.c                                       |   657 -
 qga/channel-posix.c                                |    68 +-
 qga/channel-win32.c                                |     2 +-
 qga/channel.h                                      |     3 +-
 qga/commands-posix.c                               |     9 +-
 qga/commands.c                                     |     2 +-
 qga/guest-agent-core.h                             |     2 +
 qga/main.c                                         |    76 +-
 qga/qapi-schema.json                               |    66 +-
 qmp.c                                              |    15 +-
 qobject/qdict.c                                    |    32 +-
 qobject/qjson.c                                    |    14 +-
 qom/cpu.c                                          |    46 +-
 qom/object.c                                       |    10 +-
 qom/object_interfaces.c                            |    82 +-
 qom/qom-qobject.c                                  |     4 +-
 qtest.c                                            |    39 +-
 replay/Makefile.objs                               |     2 +
 replay/replay-audio.c                              |    79 +
 replay/replay-char.c                               |     8 +-
 replay/replay-events.c                             |    11 +
 replay/replay-internal.c                           |     4 +
 replay/replay-internal.h                           |    14 +
 replay/replay-net.c                                |   102 +
 replay/replay-snapshot.c                           |    17 +
 replay/replay.c                                    |    12 +-
 roms/SLOF                                          |     2 +-
 roms/openbios                                      |     2 +-
 roms/seabios                                       |     2 +-
 rules.mak                                          |    67 +-
 scripts/analyze-inclusions                         |     8 +-
 scripts/coverity-model.c                           |    17 +-
 scripts/dump-guest-memory.py                       |    14 +-
 scripts/hxtool                                     |    11 +-
 scripts/kvm/vmxcap                                 |    23 +-
 scripts/qapi-commands.py                           |    23 +-
 scripts/qapi-event.py                              |     2 +-
 scripts/qapi-introspect.py                         |     6 +-
 scripts/qapi-types.py                              |     4 +-
 scripts/qapi-visit.py                              |     8 +-
 scripts/qapi.py                                    |   983 +-
 scripts/qapi2texi.py                               |   300 +
 scripts/qemu-binfmt-conf.sh                        |     9 +-
 scripts/qemugdb/mtree.py                           |    12 +-
 scripts/qmp/qmp-shell                              |     4 +-
 scripts/simpletrace.py                             |    10 +-
 scripts/texi2pod.pl                                |    54 +-
 scripts/tracetool.py                               |    31 +-
 scripts/tracetool/backend/dtrace.py                |     7 +-
 scripts/tracetool/backend/simple.py                |     1 -
 scripts/tracetool/backend/ust.py                   |     7 +-
 scripts/tracetool/format/c.py                      |     7 +-
 scripts/tracetool/format/tcg_h.py                  |     7 +-
 scripts/tracetool/format/tcg_helper_c.py           |     7 +-
 scripts/tracetool/format/ust_events_c.py           |     2 +-
 scripts/tracetool/format/ust_events_h.py           |     7 +-
 scripts/update-linux-headers.sh                    |    15 +-
 scripts/vmstate-static-checker.py                  |     5 +
 slirp/dhcpv6.c                                     |     2 +-
 slirp/ip6_icmp.c                                   |    49 +-
 slirp/mbuf.c                                       |    30 +-
 slirp/slirp.c                                      |     4 +-
 slirp/slirp.h                                      |     5 -
 slirp/socket.c                                     |     4 +-
 slirp/tcp_input.c                                  |    16 +-
 slirp/tcp_output.c                                 |     6 +-
 slirp/tcp_timer.c                                  |     2 +-
 slirp/tcpip.h                                      |     2 +-
 slirp/tftp.c                                       |    26 +-
 slirp/tftp.h                                       |     8 +-
 slirp/udp.c                                        |     4 +
 spice-qemu-char.c                                  |   231 +-
 stubs/Makefile.objs                                |    21 +-
 stubs/cpu-get-icount.c                             |     6 +
 stubs/cpus.c                                       |    11 -
 stubs/fdset-add-fd.c                               |     8 -
 stubs/fdset-find-fd.c                              |     8 -
 stubs/fdset-get-fd.c                               |     8 -
 stubs/fdset-remove-fd.c                            |     7 -
 stubs/fdset.c                                      |    22 +
 stubs/get-fd.c                                     |    10 -
 stubs/get-next-serial.c                            |     4 -
 stubs/iohandler.c                                  |     8 -
 stubs/ipmi.c                                       |    14 -
 stubs/kvm.c                                        |     8 -
 stubs/linux-aio.c                                  |    32 +
 stubs/migr-blocker.c                               |     3 +-
 stubs/migration-colo.c                             |    46 -
 stubs/mon-is-qmp.c                                 |    10 -
 stubs/monitor-init.c                               |     7 -
 stubs/monitor.c                                    |    16 +
 stubs/pc_madt_cpu_entry.c                          |     2 +-
 stubs/replay-user.c                                |    33 -
 stubs/replay.c                                     |     4 +-
 stubs/reset.c                                      |    14 -
 stubs/set-fd-handler.c                             |    10 -
 stubs/smbios_type_38.c                             |    14 -
 stubs/vhost.c                                      |     7 -
 stubs/vmgenid.c                                    |     9 +
 stubs/vmstate.c                                    |     9 +-
 target-alpha/Makefile.objs                         |     4 -
 target-alpha/STATUS                                |    28 -
 target-alpha/cpu-qom.h                             |    52 -
 target-alpha/cpu.c                                 |   342 -
 target-alpha/cpu.h                                 |   518 -
 target-alpha/fpu_helper.c                          |   553 -
 target-alpha/gdbstub.c                             |    94 -
 target-alpha/helper.c                              |   490 -
 target-alpha/helper.h                              |   104 -
 target-alpha/int_helper.c                          |   280 -
 target-alpha/machine.c                             |    91 -
 target-alpha/mem_helper.c                          |    89 -
 target-alpha/sys_helper.c                          |    91 -
 target-alpha/translate.c                           |  3010 ---
 target-alpha/vax_helper.c                          |   355 -
 target-arm/Makefile.objs                           |    12 -
 target-arm/arch_dump.c                             |   337 -
 target-arm/arm-powerctl.c                          |   228 -
 target-arm/arm-powerctl.h                          |    75 -
 target-arm/arm-semi.c                              |   656 -
 target-arm/arm_ldst.h                              |    49 -
 target-arm/cpu-qom.h                               |    90 -
 target-arm/cpu.c                                   |  1622 --
 target-arm/cpu.h                                   |  2466 ---
 target-arm/cpu64.c                                 |   353 -
 target-arm/crypto_helper.c                         |   465 -
 target-arm/gdbstub.c                               |   103 -
 target-arm/gdbstub64.c                             |    72 -
 target-arm/helper-a64.c                            |   559 -
 target-arm/helper-a64.h                            |    50 -
 target-arm/helper.c                                |  9623 ---------
 target-arm/helper.h                                |   542 -
 target-arm/internals.h                             |   489 -
 target-arm/iwmmxt_helper.c                         |   671 -
 target-arm/kvm-consts.h                            |   185 -
 target-arm/kvm-stub.c                              |    25 -
 target-arm/kvm.c                                   |   640 -
 target-arm/kvm32.c                                 |   529 -
 target-arm/kvm64.c                                 |   982 -
 target-arm/kvm_arm.h                               |   291 -
 target-arm/machine.c                               |   333 -
 target-arm/monitor.c                               |    83 -
 target-arm/neon_helper.c                           |  2242 --
 target-arm/op_addsub.h                             |   103 -
 target-arm/op_helper.c                             |  1335 --
 target-arm/psci.c                                  |   202 -
 target-arm/trace-events                            |    10 -
 target-arm/translate-a64.c                         | 11430 -----------
 target-arm/translate.c                             | 12055 -----------
 target-arm/translate.h                             |   155 -
 target-cris/Makefile.objs                          |     3 -
 target-cris/cpu-qom.h                              |    55 -
 target-cris/cpu.c                                  |   357 -
 target-cris/cpu.h                                  |   309 -
 target-cris/crisv10-decode.h                       |   108 -
 target-cris/crisv32-decode.h                       |   133 -
 target-cris/gdbstub.c                              |   131 -
 target-cris/helper.c                               |   319 -
 target-cris/helper.h                               |    24 -
 target-cris/machine.c                              |    95 -
 target-cris/mmu.c                                  |   362 -
 target-cris/mmu.h                                  |    17 -
 target-cris/op_helper.c                            |   639 -
 target-cris/opcode-cris.h                          |   355 -
 target-cris/translate.c                            |  3413 ----
 target-cris/translate_v10.c                        |  1315 --
 target-i386/Makefile.objs                          |     7 -
 target-i386/TODO                                   |    31 -
 target-i386/arch_dump.c                            |   453 -
 target-i386/arch_memory_mapping.c                  |   281 -
 target-i386/bpt_helper.c                           |   328 -
 target-i386/cc_helper.c                            |   385 -
 target-i386/cc_helper_template.h                   |   242 -
 target-i386/cpu-qom.h                              |    77 -
 target-i386/cpu.c                                  |  3755 ----
 target-i386/cpu.h                                  |  1656 --
 target-i386/excp_helper.c                          |   137 -
 target-i386/fpu_helper.c                           |  1625 --
 target-i386/gdbstub.c                              |   234 -
 target-i386/helper.c                               |  1446 --
 target-i386/helper.h                               |   230 -
 target-i386/hyperv.c                               |   140 -
 target-i386/hyperv.h                               |    42 -
 target-i386/int_helper.c                           |   483 -
 target-i386/kvm-stub.c                             |    42 -
 target-i386/kvm.c                                  |  3536 ----
 target-i386/kvm_i386.h                             |    48 -
 target-i386/machine.c                              |  1047 -
 target-i386/mem_helper.c                           |   215 -
 target-i386/misc_helper.c                          |   639 -
 target-i386/monitor.c                              |   513 -
 target-i386/mpx_helper.c                           |   168 -
 target-i386/ops_sse.h                              |  2296 ---
 target-i386/ops_sse_header.h                       |   360 -
 target-i386/seg_helper.c                           |  2568 ---
 target-i386/shift_helper_template.h                |   108 -
 target-i386/smm_helper.c                           |   342 -
 target-i386/svm.h                                  |   222 -
 target-i386/svm_helper.c                           |   774 -
 target-i386/trace-events                           |     7 -
 target-i386/translate.c                            |  8502 --------
 target-lm32/Makefile.objs                          |     4 -
 target-lm32/README                                 |    45 -
 target-lm32/TODO                                   |     1 -
 target-lm32/cpu-qom.h                              |    52 -
 target-lm32/cpu.c                                  |   328 -
 target-lm32/cpu.h                                  |   274 -
 target-lm32/gdbstub.c                              |    93 -
 target-lm32/helper.c                               |   237 -
 target-lm32/helper.h                               |    14 -
 target-lm32/lm32-semi.c                            |   212 -
 target-lm32/machine.c                              |    36 -
 target-lm32/op_helper.c                            |   162 -
 target-lm32/translate.c                            |  1254 --
 target-m68k/Makefile.objs                          |     3 -
 target-m68k/cpu-qom.h                              |    52 -
 target-m68k/cpu.c                                  |   324 -
 target-m68k/cpu.h                                  |   308 -
 target-m68k/gdbstub.c                              |    76 -
 target-m68k/helper.c                               |   810 -
 target-m68k/helper.h                               |    49 -
 target-m68k/m68k-semi.c                            |   462 -
 target-m68k/op_helper.c                            |   229 -
 target-m68k/qregs.def                              |    13 -
 target-m68k/translate.c                            |  3595 ----
 target-microblaze/Makefile.objs                    |     3 -
 target-microblaze/cpu-qom.h                        |    52 -
 target-microblaze/cpu.c                            |   292 -
 target-microblaze/cpu.h                            |   381 -
 target-microblaze/gdbstub.c                        |    57 -
 target-microblaze/helper.c                         |   307 -
 target-microblaze/helper.h                         |    37 -
 target-microblaze/microblaze-decode.h              |    55 -
 target-microblaze/mmu.c                            |   303 -
 target-microblaze/mmu.h                            |    90 -
 target-microblaze/op_helper.c                      |   523 -
 target-microblaze/translate.c                      |  1872 --
 target-mips/Makefile.objs                          |     4 -
 target-mips/TODO                                   |    51 -
 target-mips/cpu-qom.h                              |    56 -
 target-mips/cpu.c                                  |   203 -
 target-mips/cpu.h                                  |  1069 -
 target-mips/dsp_helper.c                           |  3762 ----
 target-mips/gdbstub.c                              |   149 -
 target-mips/helper.c                               |   969 -
 target-mips/helper.h                               |   962 -
 target-mips/kvm.c                                  |  1060 -
 target-mips/kvm_mips.h                             |    26 -
 target-mips/lmi_helper.c                           |   745 -
 target-mips/machine.c                              |   302 -
 target-mips/mips-defs.h                            |    91 -
 target-mips/mips-semi.c                            |   374 -
 target-mips/msa_helper.c                           |  3453 ----
 target-mips/op_helper.c                            |  4196 ----
 target-mips/translate.c                            | 20423 ------------------
 target-mips/translate_init.c                       |   944 -
 target-moxie/Makefile.objs                         |     2 -
 target-moxie/cpu.c                                 |   192 -
 target-moxie/cpu.h                                 |   143 -
 target-moxie/helper.c                              |   162 -
 target-moxie/helper.h                              |     5 -
 target-moxie/machine.c                             |    22 -
 target-moxie/machine.h                             |     1 -
 target-moxie/mmu.c                                 |    33 -
 target-moxie/mmu.h                                 |    14 -
 target-moxie/translate.c                           |   908 -
 target-openrisc/Makefile.objs                      |     5 -
 target-openrisc/cpu.c                              |   278 -
 target-openrisc/cpu.h                              |   411 -
 target-openrisc/exception.c                        |    31 -
 target-openrisc/exception.h                        |    28 -
 target-openrisc/exception_helper.c                 |    30 -
 target-openrisc/fpu_helper.c                       |   301 -
 target-openrisc/gdbstub.c                          |    84 -
 target-openrisc/helper.h                           |    66 -
 target-openrisc/int_helper.c                       |    80 -
 target-openrisc/interrupt.c                        |    87 -
 target-openrisc/interrupt_helper.c                 |    60 -
 target-openrisc/machine.c                          |    54 -
 target-openrisc/mmu.c                              |   238 -
 target-openrisc/mmu_helper.c                       |    44 -
 target-openrisc/sys_helper.c                       |   288 -
 target-openrisc/translate.c                        |  1783 --
 target-ppc/Makefile.objs                           |    17 -
 target-ppc/STATUS                                  |   550 -
 target-ppc/arch_dump.c                             |   286 -
 target-ppc/cpu-models.c                            |  1426 --
 target-ppc/cpu-models.h                            |   754 -
 target-ppc/cpu-qom.h                               |   219 -
 target-ppc/cpu.h                                   |  2454 ---
 target-ppc/dfp_helper.c                            |  1331 --
 target-ppc/excp_helper.c                           |  1142 --
 target-ppc/fpu_helper.c                            |  2789 ---
 target-ppc/gdbstub.c                               |   321 -
 target-ppc/helper.h                                |   742 -
 target-ppc/helper_regs.h                           |   189 -
 target-ppc/int_helper.c                            |  3126 ---
 target-ppc/internal.h                              |    50 -
 target-ppc/kvm-stub.c                              |    20 -
 target-ppc/kvm.c                                   |  2674 ---
 target-ppc/kvm_ppc.h                               |   330 -
 target-ppc/machine.c                               |   615 -
 target-ppc/mem_helper.c                            |   310 -
 target-ppc/mfrom_table.c                           |    79 -
 target-ppc/mfrom_table_gen.c                       |    32 -
 target-ppc/misc_helper.c                           |   210 -
 target-ppc/mmu-hash32.c                            |   568 -
 target-ppc/mmu-hash32.h                            |   112 -
 target-ppc/mmu-hash64.c                            |  1059 -
 target-ppc/mmu-hash64.h                            |   136 -
 target-ppc/mmu_helper.c                            |  2907 ---
 target-ppc/monitor.c                               |   147 -
 target-ppc/timebase_helper.c                       |   176 -
 target-ppc/trace-events                            |     5 -
 target-ppc/translate.c                             |  7200 -------
 target-ppc/translate/dfp-impl.inc.c                |   232 -
 target-ppc/translate/dfp-ops.inc.c                 |   165 -
 target-ppc/translate/fp-impl.inc.c                 |  1070 -
 target-ppc/translate/fp-ops.inc.c                  |   111 -
 target-ppc/translate/spe-impl.inc.c                |  1229 --
 target-ppc/translate/spe-ops.inc.c                 |   105 -
 target-ppc/translate/vmx-impl.inc.c                |  1113 -
 target-ppc/translate/vmx-ops.inc.c                 |   294 -
 target-ppc/translate/vsx-impl.inc.c                |  1009 -
 target-ppc/translate/vsx-ops.inc.c                 |   300 -
 target-ppc/translate_init.c                        | 10601 ----------
 target-ppc/user_only_helper.c                      |    47 -
 target-s390x/Makefile.objs                         |    25 -
 target-s390x/arch_dump.c                           |   249 -
 target-s390x/cc_helper.c                           |   570 -
 target-s390x/cpu-qom.h                             |    66 -
 target-s390x/cpu.c                                 |   462 -
 target-s390x/cpu.h                                 |  1296 --
 target-s390x/cpu_features.c                        |   404 -
 target-s390x/cpu_features.h                        |    93 -
 target-s390x/cpu_features_def.h                    |   231 -
 target-s390x/cpu_models.c                          |  1100 -
 target-s390x/cpu_models.h                          |   119 -
 target-s390x/fpu_helper.c                          |   749 -
 target-s390x/gdbstub.c                             |   313 -
 target-s390x/gen-features.c                        |   592 -
 target-s390x/helper.c                              |   721 -
 target-s390x/helper.h                              |   133 -
 target-s390x/insn-data.def                         |   931 -
 target-s390x/insn-format.def                       |    55 -
 target-s390x/int_helper.c                          |   156 -
 target-s390x/interrupt.c                           |   120 -
 target-s390x/ioinst.c                              |   834 -
 target-s390x/kvm.c                                 |  2653 ---
 target-s390x/machine.c                             |   193 -
 target-s390x/mem_helper.c                          |  1202 --
 target-s390x/misc_helper.c                         |   653 -
 target-s390x/mmu_helper.c                          |   499 -
 target-s390x/trace-events                          |    22 -
 target-s390x/translate.c                           |  5452 -----
 target-sh4/Makefile.objs                           |     3 -
 target-sh4/README.sh4                              |   150 -
 target-sh4/cpu-qom.h                               |    65 -
 target-sh4/cpu.c                                   |   332 -
 target-sh4/cpu.h                                   |   391 -
 target-sh4/gdbstub.c                               |   147 -
 target-sh4/helper.c                                |   872 -
 target-sh4/helper.h                                |    45 -
 target-sh4/monitor.c                               |    53 -
 target-sh4/op_helper.c                             |   498 -
 target-sh4/translate.c                             |  1944 --
 target-sparc/Makefile.objs                         |     7 -
 target-sparc/TODO                                  |    88 -
 target-sparc/asi.h                                 |   311 -
 target-sparc/cc_helper.c                           |   471 -
 target-sparc/cpu-qom.h                             |    56 -
 target-sparc/cpu.c                                 |   895 -
 target-sparc/cpu.h                                 |   779 -
 target-sparc/fop_helper.c                          |   400 -
 target-sparc/gdbstub.c                             |   209 -
 target-sparc/helper.c                              |   257 -
 target-sparc/helper.h                              |   168 -
 target-sparc/int32_helper.c                        |   175 -
 target-sparc/int64_helper.c                        |   205 -
 target-sparc/ldst_helper.c                         |  1709 --
 target-sparc/machine.c                             |   194 -
 target-sparc/mmu_helper.c                          |   880 -
 target-sparc/monitor.c                             |   159 -
 target-sparc/trace-events                          |    28 -
 target-sparc/translate.c                           |  5924 ------
 target-sparc/vis_helper.c                          |   490 -
 target-sparc/win_helper.c                          |   400 -
 target-tilegx/Makefile.objs                        |     1 -
 target-tilegx/cpu.c                                |   187 -
 target-tilegx/cpu.h                                |   178 -
 target-tilegx/helper.c                             |   163 -
 target-tilegx/helper.h                             |    26 -
 target-tilegx/opcode_tilegx.h                      |  1406 --
 target-tilegx/simd_helper.c                        |   166 -
 target-tilegx/spr_def_64.h                         |   216 -
 target-tilegx/translate.c                          |  2457 ---
 target-tricore/Makefile.objs                       |     1 -
 target-tricore/cpu-qom.h                           |    44 -
 target-tricore/cpu.c                               |   220 -
 target-tricore/cpu.h                               |   424 -
 target-tricore/csfr.def                            |   124 -
 target-tricore/fpu_helper.c                        |   217 -
 target-tricore/helper.c                            |   146 -
 target-tricore/helper.h                            |   151 -
 target-tricore/op_helper.c                         |  2842 ---
 target-tricore/translate.c                         |  8869 --------
 target-tricore/tricore-defs.h                      |    28 -
 target-tricore/tricore-opcodes.h                   |  1463 --
 target-unicore32/Makefile.objs                     |     4 -
 target-unicore32/cpu-qom.h                         |    41 -
 target-unicore32/cpu.c                             |   204 -
 target-unicore32/cpu.h                             |   188 -
 target-unicore32/helper.c                          |   263 -
 target-unicore32/helper.h                          |    65 -
 target-unicore32/op_helper.c                       |   261 -
 target-unicore32/softmmu.c                         |   278 -
 target-unicore32/translate.c                       |  2111 --
 target-unicore32/ucf64_helper.c                    |   325 -
 target-xtensa/Makefile.objs                        |     7 -
 target-xtensa/core-dc232b.c                        |    50 -
 target-xtensa/core-dc232b/core-isa.h               |   422 -
 target-xtensa/core-dc232b/gdb-config.c             |   261 -
 target-xtensa/core-dc233c.c                        |    51 -
 target-xtensa/core-dc233c/core-isa.h               |   473 -
 target-xtensa/core-dc233c/gdb-config.c             |   145 -
 target-xtensa/core-fsf.c                           |    49 -
 target-xtensa/core-fsf/core-isa.h                  |   360 -
 target-xtensa/cpu-qom.h                            |    66 -
 target-xtensa/cpu.c                                |   184 -
 target-xtensa/cpu.h                                |   587 -
 target-xtensa/gdbstub.c                            |   128 -
 target-xtensa/helper.c                             |   730 -
 target-xtensa/helper.h                             |    58 -
 target-xtensa/import_core.sh                       |    51 -
 target-xtensa/monitor.c                            |    35 -
 target-xtensa/op_helper.c                          |   984 -
 target-xtensa/overlay_tool.h                       |   602 -
 target-xtensa/translate.c                          |  3225 ---
 target-xtensa/xtensa-semi.c                        |   318 -
 target/alpha/Makefile.objs                         |     4 +
 target/alpha/STATUS                                |    28 +
 target/alpha/cpu-qom.h                             |    52 +
 target/alpha/cpu.c                                 |   342 +
 target/alpha/cpu.h                                 |   521 +
 target/alpha/fpu_helper.c                          |   553 +
 target/alpha/gdbstub.c                             |    94 +
 target/alpha/helper.c                              |   490 +
 target/alpha/helper.h                              |   100 +
 target/alpha/int_helper.c                          |   265 +
 target/alpha/machine.c                             |    93 +
 target/alpha/mem_helper.c                          |    89 +
 target/alpha/sys_helper.c                          |    91 +
 target/alpha/translate.c                           |  3028 +++
 target/alpha/vax_helper.c                          |   355 +
 target/arm/Makefile.objs                           |    12 +
 target/arm/arch_dump.c                             |   337 +
 target/arm/arm-powerctl.c                          |   300 +
 target/arm/arm-powerctl.h                          |    77 +
 target/arm/arm-semi.c                              |   656 +
 target/arm/arm_ldst.h                              |    57 +
 target/arm/cpu-qom.h                               |    90 +
 target/arm/cpu.c                                   |  1724 ++
 target/arm/cpu.h                                   |  2569 +++
 target/arm/cpu64.c                                 |   361 +
 target/arm/crypto_helper.c                         |   465 +
 target/arm/gdbstub.c                               |   103 +
 target/arm/gdbstub64.c                             |    72 +
 target/arm/helper-a64.c                            |   539 +
 target/arm/helper-a64.h                            |    46 +
 target/arm/helper.c                                |  9924 +++++++++
 target/arm/helper.h                                |   541 +
 target/arm/internals.h                             |   501 +
 target/arm/iwmmxt_helper.c                         |   671 +
 target/arm/kvm-consts.h                            |   187 +
 target/arm/kvm-stub.c                              |    25 +
 target/arm/kvm.c                                   |   631 +
 target/arm/kvm32.c                                 |   529 +
 target/arm/kvm64.c                                 |   982 +
 target/arm/kvm_arm.h                               |   291 +
 target/arm/machine.c                               |   382 +
 target/arm/monitor.c                               |    83 +
 target/arm/neon_helper.c                           |  2242 ++
 target/arm/op_addsub.h                             |   103 +
 target/arm/op_helper.c                             |  1408 ++
 target/arm/psci.c                                  |   215 +
 target/arm/trace-events                            |    10 +
 target/arm/translate-a64.c                         | 11410 +++++++++++
 target/arm/translate.c                             | 12167 +++++++++++
 target/arm/translate.h                             |   169 +
 target/cris/Makefile.objs                          |     3 +
 target/cris/cpu-qom.h                              |    55 +
 target/cris/cpu.c                                  |   356 +
 target/cris/cpu.h                                  |   312 +
 target/cris/crisv10-decode.h                       |   108 +
 target/cris/crisv32-decode.h                       |   133 +
 target/cris/gdbstub.c                              |   131 +
 target/cris/helper.c                               |   319 +
 target/cris/helper.h                               |    23 +
 target/cris/machine.c                              |    95 +
 target/cris/mmu.c                                  |   362 +
 target/cris/mmu.h                                  |    17 +
 target/cris/op_helper.c                            |   634 +
 target/cris/opcode-cris.h                          |   355 +
 target/cris/translate.c                            |  3413 ++++
 target/cris/translate_v10.c                        |  1315 ++
 target/hppa/Makefile.objs                          |     1 +
 target/hppa/cpu-qom.h                              |    52 +
 target/hppa/cpu.c                                  |   164 +
 target/hppa/cpu.h                                  |   144 +
 target/hppa/gdbstub.c                              |   112 +
 target/hppa/helper.c                               |   137 +
 target/hppa/helper.h                               |    66 +
 target/hppa/op_helper.c                            |   570 +
 target/hppa/translate.c                            |  3939 ++++
 target/i386/Makefile.objs                          |    14 +
 target/i386/TODO                                   |    31 +
 target/i386/arch_dump.c                            |   452 +
 target/i386/arch_memory_mapping.c                  |   313 +
 target/i386/bpt_helper.c                           |   335 +
 target/i386/cc_helper.c                            |   388 +
 target/i386/cc_helper_template.h                   |   242 +
 target/i386/cpu-qom.h                              |    85 +
 target/i386/cpu.c                                  |  4115 ++++
 target/i386/cpu.h                                  |  1681 ++
 target/i386/excp_helper.c                          |   138 +
 target/i386/fpu_helper.c                           |  1637 ++
 target/i386/gdbstub.c                              |   260 +
 target/i386/hax-all.c                              |  1155 ++
 target/i386/hax-darwin.c                           |   316 +
 target/i386/hax-darwin.h                           |    63 +
 target/i386/hax-i386.h                             |    94 +
 target/i386/hax-interface.h                        |   361 +
 target/i386/hax-mem.c                              |   289 +
 target/i386/hax-windows.c                          |   479 +
 target/i386/hax-windows.h                          |    89 +
 target/i386/helper.c                               |  1487 ++
 target/i386/helper.h                               |   228 +
 target/i386/hyperv.c                               |   141 +
 target/i386/hyperv.h                               |    42 +
 target/i386/int_helper.c                           |   472 +
 target/i386/kvm-stub.c                             |    42 +
 target/i386/kvm.c                                  |  3575 ++++
 target/i386/kvm_i386.h                             |    49 +
 target/i386/machine.c                              |  1059 +
 target/i386/mem_helper.c                           |   215 +
 target/i386/misc_helper.c                          |   642 +
 target/i386/monitor.c                              |   653 +
 target/i386/mpx_helper.c                           |   168 +
 target/i386/ops_sse.h                              |  2270 ++
 target/i386/ops_sse_header.h                       |   359 +
 target/i386/seg_helper.c                           |  2571 +++
 target/i386/shift_helper_template.h                |   108 +
 target/i386/smm_helper.c                           |   349 +
 target/i386/svm.h                                  |   222 +
 target/i386/svm_helper.c                           |   775 +
 target/i386/trace-events                           |     7 +
 target/i386/translate.c                            |  8535 ++++++++
 target/lm32/Makefile.objs                          |     4 +
 target/lm32/README                                 |    45 +
 target/lm32/TODO                                   |     1 +
 target/lm32/cpu-qom.h                              |    52 +
 target/lm32/cpu.c                                  |   327 +
 target/lm32/cpu.h                                  |   277 +
 target/lm32/gdbstub.c                              |    93 +
 target/lm32/helper.c                               |   237 +
 target/lm32/helper.h                               |    14 +
 target/lm32/lm32-semi.c                            |   212 +
 target/lm32/machine.c                              |    36 +
 target/lm32/op_helper.c                            |   162 +
 target/lm32/translate.c                            |  1254 ++
 target/m68k/Makefile.objs                          |     3 +
 target/m68k/cpu-qom.h                              |    52 +
 target/m68k/cpu.c                                  |   323 +
 target/m68k/cpu.h                                  |   308 +
 target/m68k/gdbstub.c                              |    76 +
 target/m68k/helper.c                               |   758 +
 target/m68k/helper.h                               |    62 +
 target/m68k/m68k-semi.c                            |   462 +
 target/m68k/op_helper.c                            |   677 +
 target/m68k/qregs.def                              |    11 +
 target/m68k/translate.c                            |  5170 +++++
 target/microblaze/Makefile.objs                    |     3 +
 target/microblaze/cpu-qom.h                        |    52 +
 target/microblaze/cpu.c                            |   291 +
 target/microblaze/cpu.h                            |   384 +
 target/microblaze/gdbstub.c                        |    57 +
 target/microblaze/helper.c                         |   307 +
 target/microblaze/helper.h                         |    36 +
 target/microblaze/microblaze-decode.h              |    55 +
 target/microblaze/mmu.c                            |   303 +
 target/microblaze/mmu.h                            |    90 +
 target/microblaze/op_helper.c                      |   518 +
 target/microblaze/translate.c                      |  1872 ++
 target/mips/Makefile.objs                          |     4 +
 target/mips/TODO                                   |    51 +
 target/mips/cpu-qom.h                              |    56 +
 target/mips/cpu.c                                  |   202 +
 target/mips/cpu.h                                  |  1073 +
 target/mips/dsp_helper.c                           |  3762 ++++
 target/mips/gdbstub.c                              |   149 +
 target/mips/helper.c                               |   977 +
 target/mips/helper.h                               |   955 +
 target/mips/kvm.c                                  |  1053 +
 target/mips/kvm_mips.h                             |    26 +
 target/mips/lmi_helper.c                           |   745 +
 target/mips/machine.c                              |   308 +
 target/mips/mips-defs.h                            |    91 +
 target/mips/mips-semi.c                            |   374 +
 target/mips/msa_helper.c                           |  3453 ++++
 target/mips/op_helper.c                            |  4189 ++++
 target/mips/trace-events                           |     5 +
 target/mips/translate.c                            | 20433 +++++++++++++++++++
 target/mips/translate_init.c                       |   944 +
 target/moxie/Makefile.objs                         |     2 +
 target/moxie/cpu.c                                 |   190 +
 target/moxie/cpu.h                                 |   146 +
 target/moxie/helper.c                              |   162 +
 target/moxie/helper.h                              |     5 +
 target/moxie/machine.c                             |    22 +
 target/moxie/machine.h                             |     1 +
 target/moxie/mmu.c                                 |    33 +
 target/moxie/mmu.h                                 |    14 +
 target/moxie/translate.c                           |   908 +
 target/nios2/Makefile.objs                         |     4 +
 target/nios2/cpu.c                                 |   237 +
 target/nios2/cpu.h                                 |   272 +
 target/nios2/helper.c                              |   313 +
 target/nios2/helper.h                              |    27 +
 target/nios2/mmu.c                                 |   296 +
 target/nios2/mmu.h                                 |    50 +
 target/nios2/monitor.c                             |    35 +
 target/nios2/op_helper.c                           |    50 +
 target/nios2/translate.c                           |   958 +
 target/openrisc/Makefile.objs                      |     5 +
 target/openrisc/cpu.c                              |   272 +
 target/openrisc/cpu.h                              |   432 +
 target/openrisc/exception.c                        |    31 +
 target/openrisc/exception.h                        |    28 +
 target/openrisc/exception_helper.c                 |    62 +
 target/openrisc/fpu_helper.c                       |   281 +
 target/openrisc/gdbstub.c                          |    89 +
 target/openrisc/helper.h                           |    61 +
 target/openrisc/interrupt.c                        |    95 +
 target/openrisc/interrupt_helper.c                 |    60 +
 target/openrisc/machine.c                          |    98 +
 target/openrisc/mmu.c                              |   239 +
 target/openrisc/mmu_helper.c                       |    44 +
 target/openrisc/sys_helper.c                       |   288 +
 target/openrisc/translate.c                        |  1678 ++
 target/ppc/Makefile.objs                           |    18 +
 target/ppc/STATUS                                  |   550 +
 target/ppc/arch_dump.c                             |   302 +
 target/ppc/compat.c                                |   191 +
 target/ppc/cpu-models.c                            |  1408 ++
 target/ppc/cpu-models.h                            |   754 +
 target/ppc/cpu-qom.h                               |   227 +
 target/ppc/cpu.c                                   |    47 +
 target/ppc/cpu.h                                   |  2522 +++
 target/ppc/dfp_helper.c                            |  1331 ++
 target/ppc/excp_helper.c                           |  1139 ++
 target/ppc/fpu_helper.c                            |  3425 ++++
 target/ppc/gdbstub.c                               |   321 +
 target/ppc/helper.h                                |   796 +
 target/ppc/helper_regs.h                           |   189 +
 target/ppc/int_helper.c                            |  3523 ++++
 target/ppc/internal.h                              |   255 +
 target/ppc/kvm-stub.c                              |    20 +
 target/ppc/kvm.c                                   |  2600 +++
 target/ppc/kvm_ppc.h                               |   315 +
 target/ppc/machine.c                               |   618 +
 target/ppc/mem_helper.c                            |   376 +
 target/ppc/mfrom_table.c                           |    79 +
 target/ppc/mfrom_table_gen.c                       |    32 +
 target/ppc/misc_helper.c                           |   208 +
 target/ppc/mmu-book3s-v3.c                         |    37 +
 target/ppc/mmu-book3s-v3.h                         |    50 +
 target/ppc/mmu-hash32.c                            |   568 +
 target/ppc/mmu-hash32.h                            |   118 +
 target/ppc/mmu-hash64.c                            |  1095 +
 target/ppc/mmu-hash64.h                            |   135 +
 target/ppc/mmu_helper.c                            |  2918 +++
 target/ppc/monitor.c                               |   151 +
 target/ppc/timebase_helper.c                       |   176 +
 target/ppc/trace-events                            |     5 +
 target/ppc/translate.c                             |  7388 +++++++
 target/ppc/translate/dfp-impl.inc.c                |   232 +
 target/ppc/translate/dfp-ops.inc.c                 |   165 +
 target/ppc/translate/fp-impl.inc.c                 |  1070 +
 target/ppc/translate/fp-ops.inc.c                  |   109 +
 target/ppc/translate/spe-impl.inc.c                |  1229 ++
 target/ppc/translate/spe-ops.inc.c                 |   105 +
 target/ppc/translate/vmx-impl.inc.c                |  1177 ++
 target/ppc/translate/vmx-ops.inc.c                 |   301 +
 target/ppc/translate/vsx-impl.inc.c                |  1504 ++
 target/ppc/translate/vsx-ops.inc.c                 |   395 +
 target/ppc/translate_init.c                        | 10676 ++++++++++
 target/ppc/user_only_helper.c                      |    47 +
 target/s390x/Makefile.objs                         |    25 +
 target/s390x/arch_dump.c                           |   263 +
 target/s390x/cc_helper.c                           |   570 +
 target/s390x/cpu-qom.h                             |    66 +
 target/s390x/cpu.c                                 |   459 +
 target/s390x/cpu.h                                 |  1297 ++
 target/s390x/cpu_features.c                        |   404 +
 target/s390x/cpu_features.h                        |    93 +
 target/s390x/cpu_features_def.h                    |   231 +
 target/s390x/cpu_models.c                          |  1099 +
 target/s390x/cpu_models.h                          |   119 +
 target/s390x/fpu_helper.c                          |   749 +
 target/s390x/gdbstub.c                             |   314 +
 target/s390x/gen-features.c                        |   592 +
 target/s390x/helper.c                              |   721 +
 target/s390x/helper.h                              |   132 +
 target/s390x/insn-data.def                         |   931 +
 target/s390x/insn-format.def                       |    55 +
 target/s390x/int_helper.c                          |   147 +
 target/s390x/interrupt.c                           |   120 +
 target/s390x/ioinst.c                              |   834 +
 target/s390x/kvm.c                                 |  2685 +++
 target/s390x/machine.c                             |   193 +
 target/s390x/mem_helper.c                          |  1202 ++
 target/s390x/misc_helper.c                         |   677 +
 target/s390x/mmu_helper.c                          |   499 +
 target/s390x/trace-events                          |    22 +
 target/s390x/translate.c                           |  5462 +++++
 target/sh4/Makefile.objs                           |     3 +
 target/sh4/README.sh4                              |   150 +
 target/sh4/cpu-qom.h                               |    65 +
 target/sh4/cpu.c                                   |   331 +
 target/sh4/cpu.h                                   |   394 +
 target/sh4/gdbstub.c                               |   147 +
 target/sh4/helper.c                                |   872 +
 target/sh4/helper.h                                |    45 +
 target/sh4/monitor.c                               |    58 +
 target/sh4/op_helper.c                             |   498 +
 target/sh4/translate.c                             |  1944 ++
 target/sparc/Makefile.objs                         |     7 +
 target/sparc/TODO                                  |    88 +
 target/sparc/asi.h                                 |   312 +
 target/sparc/cc_helper.c                           |   471 +
 target/sparc/cpu-qom.h                             |    56 +
 target/sparc/cpu.c                                 |   901 +
 target/sparc/cpu.h                                 |   823 +
 target/sparc/fop_helper.c                          |   400 +
 target/sparc/gdbstub.c                             |   209 +
 target/sparc/helper.c                              |   252 +
 target/sparc/helper.h                              |   168 +
 target/sparc/int32_helper.c                        |   175 +
 target/sparc/int64_helper.c                        |   241 +
 target/sparc/ldst_helper.c                         |  1942 ++
 target/sparc/machine.c                             |   196 +
 target/sparc/mmu_helper.c                          |   866 +
 target/sparc/monitor.c                             |   163 +
 target/sparc/trace-events                          |    28 +
 target/sparc/translate.c                           |  5989 ++++++
 target/sparc/vis_helper.c                          |   490 +
 target/sparc/win_helper.c                          |   455 +
 target/tilegx/Makefile.objs                        |     1 +
 target/tilegx/cpu.c                                |   186 +
 target/tilegx/cpu.h                                |   181 +
 target/tilegx/helper.c                             |   148 +
 target/tilegx/helper.h                             |    23 +
 target/tilegx/opcode_tilegx.h                      |  1406 ++
 target/tilegx/simd_helper.c                        |   166 +
 target/tilegx/spr_def_64.h                         |   216 +
 target/tilegx/translate.c                          |  2457 +++
 target/tricore/Makefile.objs                       |     1 +
 target/tricore/cpu-qom.h                           |    44 +
 target/tricore/cpu.c                               |   218 +
 target/tricore/cpu.h                               |   424 +
 target/tricore/csfr.def                            |   124 +
 target/tricore/fpu_helper.c                        |   349 +
 target/tricore/helper.c                            |   146 +
 target/tricore/helper.h                            |   152 +
 target/tricore/op_helper.c                         |  2827 +++
 target/tricore/translate.c                         |  8918 ++++++++
 target/tricore/tricore-defs.h                      |    28 +
 target/tricore/tricore-opcodes.h                   |  1466 ++
 target/unicore32/Makefile.objs                     |     4 +
 target/unicore32/cpu-qom.h                         |    41 +
 target/unicore32/cpu.c                             |   204 +
 target/unicore32/cpu.h                             |   188 +
 target/unicore32/helper.c                          |   253 +
 target/unicore32/helper.h                          |    62 +
 target/unicore32/op_helper.c                       |   261 +
 target/unicore32/softmmu.c                         |   278 +
 target/unicore32/translate.c                       |  2111 ++
 target/unicore32/ucf64_helper.c                    |   325 +
 target/xtensa/Makefile.objs                        |     7 +
 target/xtensa/core-dc232b.c                        |    50 +
 target/xtensa/core-dc232b/core-isa.h               |   422 +
 target/xtensa/core-dc232b/gdb-config.c             |   261 +
 target/xtensa/core-dc233c.c                        |    51 +
 target/xtensa/core-dc233c/core-isa.h               |   473 +
 target/xtensa/core-dc233c/gdb-config.c             |   145 +
 target/xtensa/core-fsf.c                           |    49 +
 target/xtensa/core-fsf/core-isa.h                  |   360 +
 target/xtensa/cpu-qom.h                            |    66 +
 target/xtensa/cpu.c                                |   192 +
 target/xtensa/cpu.h                                |   649 +
 target/xtensa/gdbstub.c                            |   128 +
 target/xtensa/helper.c                             |   744 +
 target/xtensa/helper.h                             |    61 +
 target/xtensa/import_core.sh                       |    53 +
 target/xtensa/monitor.c                            |    39 +
 target/xtensa/op_helper.c                          |  1035 +
 target/xtensa/overlay_tool.h                       |   791 +
 target/xtensa/translate.c                          |  3314 +++
 target/xtensa/xtensa-semi.c                        |   341 +
 tcg-runtime.c                                      |    40 +
 tcg/README                                         |    41 +-
 tcg/aarch64/tcg-target.h                           |    10 +
 tcg/aarch64/tcg-target.inc.c                       |   161 +-
 tcg/arm/tcg-target.h                               |    41 +-
 tcg/arm/tcg-target.inc.c                           |   121 +-
 tcg/i386/tcg-target.h                              |    28 +
 tcg/i386/tcg-target.inc.c                          |   727 +-
 tcg/ia64/tcg-target.h                              |    10 +
 tcg/ia64/tcg-target.inc.c                          |    28 +-
 tcg/mips/tcg-target.h                              |    70 +-
 tcg/mips/tcg-target.inc.c                          |  1252 +-
 tcg/optimize.c                                     |    94 +
 tcg/ppc/tcg-target.h                               |    13 +
 tcg/ppc/tcg-target.inc.c                           |   117 +-
 tcg/s390/tcg-target.h                              |   128 +-
 tcg/s390/tcg-target.inc.c                          |   248 +-
 tcg/sparc/tcg-target.h                             |    10 +
 tcg/sparc/tcg-target.inc.c                         |    57 +-
 tcg/tcg-mo.h                                       |    48 +
 tcg/tcg-op.c                                       |   692 +-
 tcg/tcg-op.h                                       |    42 +
 tcg/tcg-opc.h                                      |    10 +
 tcg/tcg-runtime.h                                  |     9 +
 tcg/tcg.c                                          |   173 +-
 tcg/tcg.h                                          |    42 +-
 tcg/tci/tcg-target.h                               |    10 +
 tcg/tci/tcg-target.inc.c                           |    27 +-
 tests/.gitignore                                   |     4 +
 tests/Makefile.include                             |   114 +-
 tests/acpi-test-data/pc/DSDT                       |   Bin 6008 -> 5098 bytes
 tests/acpi-test-data/pc/DSDT.bridge                |   Bin 7867 -> 6957 bytes
 tests/acpi-test-data/pc/DSDT.cphp                  |   Bin 6471 -> 5561 bytes
 tests/acpi-test-data/pc/DSDT.ipmikcs               |   Bin 6080 -> 5170 bytes
 tests/acpi-test-data/pc/DSDT.memhp                 |   Bin 0 -> 6463 bytes
 tests/acpi-test-data/pc/SRAT.memhp                 |   Bin 0 -> 224 bytes
 tests/acpi-test-data/q35/DSDT                      |   Bin 8770 -> 7824 bytes
 tests/acpi-test-data/q35/DSDT.bridge               |   Bin 8787 -> 7841 bytes
 tests/acpi-test-data/q35/DSDT.cphp                 |   Bin 9233 -> 8287 bytes
 tests/acpi-test-data/q35/DSDT.ipmibt               |   Bin 8845 -> 7899 bytes
 tests/acpi-test-data/q35/DSDT.memhp                |   Bin 0 -> 9189 bytes
 tests/acpi-test-data/q35/SRAT.memhp                |   Bin 0 -> 224 bytes
 tests/acpi-utils.c                                 |    65 +
 tests/acpi-utils.h                                 |    94 +
 tests/bios-tables-test.c                           |   158 +-
 tests/boot-serial-test.c                           |     6 +-
 tests/check-qdict.c                                |    37 +-
 tests/check-qjson.c                                |   199 +-
 tests/check-qnull.c                                |     2 +-
 tests/device-introspect-test.c                     |    60 +-
 tests/display-vga-test.c                           |     7 +-
 tests/docker/Makefile.include                      |     6 +
 tests/docker/common.rc                             |     2 +-
 tests/docker/docker.py                             |    22 +-
 tests/docker/dockerfiles/debian-arm64-cross.docker |    15 +
 tests/docker/dockerfiles/debian-armhf-cross.docker |    15 +
 tests/docker/dockerfiles/debian-s390x-cross.docker |    22 +
 tests/docker/dockerfiles/debian.docker             |    25 +
 tests/docker/dockerfiles/fedora.docker             |     2 +-
 tests/e1000-test.c                                 |     1 +
 tests/e1000e-test.c                                |     6 +-
 tests/eepro100-test.c                              |     1 +
 tests/endianness-test.c                            |     3 +
 tests/hd-geo-test.c                                |    53 +-
 tests/i440fx-test.c                                |     5 +
 tests/ide-test.c                                   |    13 +
 tests/iothread.c                                   |    91 +
 tests/iothread.h                                   |    25 +
 tests/ipmi-bt-test.c                               |     1 +
 tests/ipmi-kcs-test.c                              |     1 +
 tests/ivshmem-test.c                               |    46 +-
 tests/libqos/pci-spapr.c                           |     4 +-
 tests/libqos/usb.c                                 |     6 +
 tests/libqos/usb.h                                 |     1 +
 tests/libqos/virtio-pci.c                          |    38 +-
 tests/libqos/virtio-pci.h                          |     6 +-
 tests/libqtest.c                                   |    66 +-
 tests/libqtest.h                                   |     8 +
 tests/m25p80-test.c                                |   133 +
 tests/pnv-xscom-test.c                             |     5 +-
 tests/postcopy-test.c                              |     2 +-
 tests/prom-env-test.c                              |    15 +-
 tests/ptimer-test-stubs.c                          |     5 +
 tests/ptimer-test.c                                |   122 +-
 tests/pvpanic-test.c                               |     1 +
 tests/q35-test.c                                   |     3 +
 tests/qapi-schema/doc-bad-alternate-member.err     |     1 +
 tests/qapi-schema/doc-bad-alternate-member.exit    |     1 +
 tests/qapi-schema/doc-bad-alternate-member.json    |     9 +
 tests/qapi-schema/doc-bad-alternate-member.out     |     0
 tests/qapi-schema/doc-bad-command-arg.err          |     1 +
 tests/qapi-schema/doc-bad-command-arg.exit         |     1 +
 tests/qapi-schema/doc-bad-command-arg.json         |     8 +
 tests/qapi-schema/doc-bad-command-arg.out          |     0
 tests/qapi-schema/doc-bad-symbol.err               |     1 +
 tests/qapi-schema/doc-bad-symbol.exit              |     1 +
 tests/qapi-schema/doc-bad-symbol.json              |     6 +
 tests/qapi-schema/doc-bad-symbol.out               |     0
 tests/qapi-schema/doc-bad-union-member.err         |     1 +
 tests/qapi-schema/doc-bad-union-member.exit        |     1 +
 tests/qapi-schema/doc-bad-union-member.json        |    19 +
 tests/qapi-schema/doc-bad-union-member.out         |     0
 tests/qapi-schema/doc-before-include.err           |     1 +
 tests/qapi-schema/doc-before-include.exit          |     1 +
 tests/qapi-schema/doc-before-include.json          |     7 +
 tests/qapi-schema/doc-before-include.out           |     0
 tests/qapi-schema/doc-before-pragma.err            |     1 +
 tests/qapi-schema/doc-before-pragma.exit           |     1 +
 tests/qapi-schema/doc-before-pragma.json           |     7 +
 tests/qapi-schema/doc-before-pragma.out            |     0
 tests/qapi-schema/doc-duplicated-arg.err           |     1 +
 tests/qapi-schema/doc-duplicated-arg.exit          |     1 +
 tests/qapi-schema/doc-duplicated-arg.json          |     7 +
 tests/qapi-schema/doc-duplicated-arg.out           |     0
 tests/qapi-schema/doc-duplicated-return.err        |     1 +
 tests/qapi-schema/doc-duplicated-return.exit       |     1 +
 tests/qapi-schema/doc-duplicated-return.json       |     8 +
 tests/qapi-schema/doc-duplicated-return.out        |     0
 tests/qapi-schema/doc-duplicated-since.err         |     1 +
 tests/qapi-schema/doc-duplicated-since.exit        |     1 +
 tests/qapi-schema/doc-duplicated-since.json        |     8 +
 tests/qapi-schema/doc-duplicated-since.out         |     0
 tests/qapi-schema/doc-empty-arg.err                |     1 +
 tests/qapi-schema/doc-empty-arg.exit               |     1 +
 tests/qapi-schema/doc-empty-arg.json               |     6 +
 tests/qapi-schema/doc-empty-arg.out                |     0
 tests/qapi-schema/doc-empty-section.err            |     1 +
 tests/qapi-schema/doc-empty-section.exit           |     1 +
 tests/qapi-schema/doc-empty-section.json           |     8 +
 tests/qapi-schema/doc-empty-section.out            |     0
 tests/qapi-schema/doc-empty-symbol.err             |     1 +
 tests/qapi-schema/doc-empty-symbol.exit            |     1 +
 tests/qapi-schema/doc-empty-symbol.json            |     5 +
 tests/qapi-schema/doc-empty-symbol.out             |     0
 tests/qapi-schema/doc-good.err                     |     0
 tests/qapi-schema/doc-good.exit                    |     1 +
 tests/qapi-schema/doc-good.json                    |   136 +
 tests/qapi-schema/doc-good.out                     |   148 +
 tests/qapi-schema/doc-good.texi                    |   243 +
 tests/qapi-schema/doc-interleaved-section.err      |     1 +
 tests/qapi-schema/doc-interleaved-section.exit     |     1 +
 tests/qapi-schema/doc-interleaved-section.json     |    21 +
 tests/qapi-schema/doc-interleaved-section.out      |     0
 tests/qapi-schema/doc-invalid-end.err              |     1 +
 tests/qapi-schema/doc-invalid-end.exit             |     1 +
 tests/qapi-schema/doc-invalid-end.json             |     5 +
 tests/qapi-schema/doc-invalid-end.out              |     0
 tests/qapi-schema/doc-invalid-end2.err             |     1 +
 tests/qapi-schema/doc-invalid-end2.exit            |     1 +
 tests/qapi-schema/doc-invalid-end2.json            |     5 +
 tests/qapi-schema/doc-invalid-end2.out             |     0
 tests/qapi-schema/doc-invalid-return.err           |     1 +
 tests/qapi-schema/doc-invalid-return.exit          |     1 +
 tests/qapi-schema/doc-invalid-return.json          |     7 +
 tests/qapi-schema/doc-invalid-return.out           |     0
 tests/qapi-schema/doc-invalid-section.err          |     1 +
 tests/qapi-schema/doc-invalid-section.exit         |     1 +
 tests/qapi-schema/doc-invalid-section.json         |     6 +
 tests/qapi-schema/doc-invalid-section.out          |     0
 tests/qapi-schema/doc-invalid-start.err            |     1 +
 tests/qapi-schema/doc-invalid-start.exit           |     1 +
 tests/qapi-schema/doc-invalid-start.json           |     5 +
 tests/qapi-schema/doc-invalid-start.out            |     0
 tests/qapi-schema/doc-missing-colon.err            |     1 +
 tests/qapi-schema/doc-missing-colon.exit           |     1 +
 tests/qapi-schema/doc-missing-colon.json           |     5 +
 tests/qapi-schema/doc-missing-colon.out            |     0
 tests/qapi-schema/doc-missing-expr.err             |     1 +
 tests/qapi-schema/doc-missing-expr.exit            |     1 +
 tests/qapi-schema/doc-missing-expr.json            |     5 +
 tests/qapi-schema/doc-missing-expr.out             |     0
 tests/qapi-schema/doc-missing-space.err            |     1 +
 tests/qapi-schema/doc-missing-space.exit           |     1 +
 tests/qapi-schema/doc-missing-space.json           |     6 +
 tests/qapi-schema/doc-missing-space.out            |     0
 tests/qapi-schema/doc-missing.err                  |     1 +
 tests/qapi-schema/doc-missing.exit                 |     1 +
 tests/qapi-schema/doc-missing.json                 |     5 +
 tests/qapi-schema/doc-missing.out                  |     0
 tests/qapi-schema/doc-no-symbol.err                |     1 +
 tests/qapi-schema/doc-no-symbol.exit               |     1 +
 tests/qapi-schema/doc-no-symbol.json               |     6 +
 tests/qapi-schema/doc-no-symbol.out                |     0
 tests/qapi-schema/enum-member-case.err             |     2 +-
 tests/qapi-schema/enum-member-case.json            |     1 +
 tests/qapi-schema/include-extra-junk.err           |     1 +
 tests/qapi-schema/include-extra-junk.exit          |     1 +
 tests/qapi-schema/include-extra-junk.json          |     3 +
 tests/qapi-schema/include-extra-junk.out           |     0
 tests/qapi-schema/pragma-doc-required-crap.err     |     1 +
 tests/qapi-schema/pragma-doc-required-crap.exit    |     1 +
 tests/qapi-schema/pragma-doc-required-crap.json    |     3 +
 tests/qapi-schema/pragma-doc-required-crap.out     |     0
 tests/qapi-schema/pragma-extra-junk.err            |     1 +
 tests/qapi-schema/pragma-extra-junk.exit           |     1 +
 tests/qapi-schema/pragma-extra-junk.json           |     3 +
 tests/qapi-schema/pragma-extra-junk.out            |     0
 .../pragma-name-case-whitelist-crap.err            |     1 +
 .../pragma-name-case-whitelist-crap.exit           |     1 +
 .../pragma-name-case-whitelist-crap.json           |     3 +
 .../pragma-name-case-whitelist-crap.out            |     0
 tests/qapi-schema/pragma-non-dict.err              |     1 +
 tests/qapi-schema/pragma-non-dict.exit             |     1 +
 tests/qapi-schema/pragma-non-dict.json             |     3 +
 tests/qapi-schema/pragma-non-dict.out              |     0
 .../qapi-schema/pragma-returns-whitelist-crap.err  |     1 +
 .../qapi-schema/pragma-returns-whitelist-crap.exit |     1 +
 .../qapi-schema/pragma-returns-whitelist-crap.json |     3 +
 .../qapi-schema/pragma-returns-whitelist-crap.out  |     0
 tests/qapi-schema/qapi-schema-test.json            |     7 +
 tests/qapi-schema/returns-whitelist.err            |     2 +-
 tests/qapi-schema/returns-whitelist.json           |     4 +
 tests/qapi-schema/test-qapi.py                     |    11 +
 tests/qapi-schema/trailing-comma-list.err          |     2 +-
 tests/qapi-schema/union-base-empty.err             |     1 +
 tests/qapi-schema/union-base-empty.exit            |     1 +
 tests/qapi-schema/union-base-empty.json            |     9 +
 tests/qapi-schema/union-base-empty.out             |     0
 tests/qemu-iotests/.gitignore                      |     2 +-
 tests/qemu-iotests/025                             |     2 +-
 tests/qemu-iotests/030                             |     5 +-
 tests/qemu-iotests/041                             |    46 +
 tests/qemu-iotests/041.out                         |     4 +-
 tests/qemu-iotests/049.out                         |    14 +-
 tests/qemu-iotests/051.out                         |     4 +-
 tests/qemu-iotests/051.pc.out                      |    22 +-
 tests/qemu-iotests/055                             |    11 +-
 tests/qemu-iotests/059.out                         |     5 +-
 tests/qemu-iotests/070.out                         |     1 -
 tests/qemu-iotests/071.out                         |     8 +-
 tests/qemu-iotests/075.out                         |     7 -
 tests/qemu-iotests/076.out                         |     3 -
 tests/qemu-iotests/078.out                         |     6 -
 tests/qemu-iotests/080.out                         |    18 -
 tests/qemu-iotests/083.out                         |    17 -
 tests/qemu-iotests/085.out                         |     2 +-
 tests/qemu-iotests/088.out                         |     6 -
 tests/qemu-iotests/092.out                         |    12 -
 tests/qemu-iotests/097                             |    27 +-
 tests/qemu-iotests/097.out                         |   180 +-
 tests/qemu-iotests/109.out                         |    10 +-
 tests/qemu-iotests/116.out                         |     7 -
 tests/qemu-iotests/131.out                         |     1 -
 tests/qemu-iotests/137                             |     2 +-
 tests/qemu-iotests/139                             |     8 +-
 tests/qemu-iotests/140.out                         |     1 -
 tests/qemu-iotests/141                             |     6 +-
 tests/qemu-iotests/141.out                         |     4 +-
 tests/qemu-iotests/147                             |    27 +-
 tests/qemu-iotests/172.out                         |    53 +
 tests/qemu-iotests/173                             |    97 +
 tests/qemu-iotests/173.out                         |    12 +
 tests/qemu-iotests/174                             |    59 +
 tests/qemu-iotests/174.out                         |     7 +
 tests/qemu-iotests/175                             |    61 +
 tests/qemu-iotests/175.out                         |    18 +
 tests/qemu-iotests/176                             |   131 +
 tests/qemu-iotests/176.out                         |   150 +
 tests/qemu-iotests/Makefile                        |     2 +-
 tests/qemu-iotests/check                           |    12 +-
 tests/qemu-iotests/common                          |     6 -
 tests/qemu-iotests/common.config                   |     6 +-
 tests/qemu-iotests/common.filter                   |     6 +-
 tests/qemu-iotests/common.qemu                     |    10 +-
 tests/qemu-iotests/common.rc                       |    39 +-
 tests/qemu-iotests/group                           |     4 +
 tests/qemu-iotests/iotests.py                      |    15 +
 tests/qmp-test.c                                   |   139 +
 tests/tcg/openrisc/Makefile                        |     4 +-
 tests/tcg/xtensa/Makefile                          |     4 +-
 tests/tcg/xtensa/test_interrupt.S                  |    27 +-
 tests/tcg/xtensa/test_sr.S                         |     1 +
 tests/tcg/xtensa/test_timer.S                      |   105 +-
 tests/tco-test.c                                   |    35 +-
 tests/test-aio-multithread.c                       |   463 +
 tests/test-aio.c                                   |     6 +-
 tests/test-bitcnt.c                                |   140 +
 tests/test-blockjob-txn.c                          |    18 +-
 tests/test-blockjob.c                              |    16 +-
 tests/test-char.c                                  |    10 +-
 tests/test-crypto-cipher.c                         |   119 +
 tests/test-crypto-hmac.c                           |   266 +
 tests/test-cutils.c                                |   644 +-
 tests/test-filter-mirror.c                         |     2 +-
 tests/test-filter-redirector.c                     |     4 +-
 tests/test-hbitmap.c                               |    11 +
 tests/test-io-channel-command.c                    |     6 +-
 tests/test-io-channel-socket.c                     |    13 +-
 tests/test-io-channel-tls.c                        |     5 +-
 tests/test-io-task.c                               |    35 +-
 tests/test-keyval.c                                |   677 +
 tests/test-opts-visitor.c                          |   103 +
 tests/test-qapi-util.c                             |    85 +
 tests/test-qemu-opts.c                             |   332 +-
 tests/test-qga.c                                   |     6 +-
 tests/test-qmp-commands.c                          |    14 +-
 tests/test-qmp-event.c                             |    14 +-
 tests/test-qobject-input-strict.c                  |   381 -
 tests/test-qobject-input-visitor.c                 |   476 +-
 tests/test-qobject-output-visitor.c                |   139 +-
 tests/test-shift128.c                              |   139 +
 tests/test-string-input-visitor.c                  |   147 +-
 tests/test-thread-pool.c                           |    12 +-
 tests/test-throttle.c                              |     7 +-
 tests/test-visitor-serialization.c                 |     4 +-
 tests/test-vmstate.c                               |   376 +-
 tests/usb-hcd-ehci-test.c                          |    19 +-
 tests/usb-hcd-uhci-test.c                          |     1 +
 tests/vhost-user-bridge.c                          |  1183 +-
 tests/vhost-user-test.c                            |    16 +-
 tests/virtio-9p-test.c                             |   494 +-
 tests/virtio-blk-test.c                            |    29 +-
 tests/virtio-scsi-test.c                           |     2 +-
 thread-pool.c                                      |   343 -
 trace-events                                       |    25 +-
 trace/Makefile.objs                                |   101 +-
 trace/control-target.c                             |    13 +-
 trace/control.c                                    |    19 +
 trace/control.h                                    |     8 +
 trace/ftrace.c                                     |     2 +-
 trace/simple.c                                     |     1 -
 translate-all.c                                    |    88 +-
 translate-common.c                                 |    14 +-
 ui/Makefile.objs                                   |     7 +-
 ui/cocoa.m                                         |     2 +-
 ui/console.c                                       |   173 +-
 ui/curses.c                                        |     1 -
 ui/egl-helpers.c                                   |    80 +-
 ui/gtk-egl.c                                       |    25 +-
 ui/gtk-gl-area.c                                   |    12 +-
 ui/gtk.c                                           |   139 +-
 ui/input-keymap.c                                  |     3 +
 ui/input-linux.c                                   |    23 +-
 ui/sdl.c                                           |    35 +-
 ui/sdl2-gl.c                                       |    28 +-
 ui/sdl2.c                                          |    16 +-
 ui/spice-core.c                                    |    11 +-
 ui/spice-display.c                                 |    76 +-
 ui/vnc-auth-vencrypt.c                             |     7 +-
 ui/vnc-jobs.c                                      |    23 -
 ui/vnc-jobs.h                                      |     2 -
 ui/vnc-ws.c                                        |    14 +-
 ui/vnc.c                                           |   761 +-
 ui/vnc.h                                           |    13 +-
 user-exec-stub.c                                   |    34 +
 user-exec.c                                        |    18 +-
 util/Makefile.objs                                 |    11 +-
 util/aio-posix.c                                   |   728 +
 util/aio-win32.c                                   |   407 +
 util/aiocb.c                                       |    55 +
 util/async.c                                       |   495 +
 util/bitmap.c                                      |     8 +
 util/compatfd.c                                    |     1 -
 util/cutils.c                                      |   247 +-
 util/event_notifier-posix.c                        |    11 +-
 util/event_notifier-win32.c                        |    13 +-
 util/fifo8.c                                       |     2 +-
 util/hbitmap.c                                     |    22 +-
 util/host-utils.c                                  |    66 +
 util/iohandler.c                                   |   136 +
 util/keyval.c                                      |   419 +
 util/lockcnt.c                                     |   397 +
 util/log.c                                         |     4 +-
 util/main-loop.c                                   |   535 +
 util/mmap-alloc.c                                  |    42 +-
 util/oslib-posix.c                                 |   163 +-
 util/oslib-win32.c                                 |     5 +-
 util/path.c                                        |     1 -
 util/qemu-coroutine-lock.c                         |   252 +-
 util/qemu-coroutine-sleep.c                        |     2 +-
 util/qemu-coroutine.c                              |    24 +-
 util/qemu-option.c                                 |   108 +-
 util/qemu-sockets.c                                |    60 +-
 util/qemu-thread-posix.c                           |    47 +-
 util/qemu-thread-win32.c                           |   142 +-
 util/qemu-timer.c                                  |   667 +
 util/systemd.c                                     |    77 +
 util/thread-pool.c                                 |   354 +
 util/trace-events                                  |    29 +-
 util/uri.c                                         |     4 +-
 vl.c                                               |   315 +-
 xen-common-stub.c                                  |     2 +-
 xen-common.c                                       |     4 +-
 xen-hvm.c                                          |     2 +-
 xen-mapcache.c                                     |     5 +-
 2160 files changed, 373338 insertions(+), 309331 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d7848c..55a001e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,18 +6,12 @@
 /config.status
 /config-temp
 /trace-events-all
-/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-helpers-wrappers.h
 /trace/generated-helpers.h
 /trace/generated-helpers.c
 /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
 *-timestamp
@@ -40,6 +34,7 @@
 /qmp-marshal.c
 /qemu-doc.html
 /qemu-doc.info
+/qemu-doc.txt
 /qemu-img
 /qemu-nbd
 /qemu-options.def
@@ -60,7 +55,6 @@
 *.a
 *.aux
 *.cp
-*.dvi
 *.exe
 *.msi
 *.dll
@@ -82,10 +76,6 @@
 *.d
 !/scripts/qemu-guest-agent/fsfreeze-hook.d
 *.o
-*.lo
-*.la
-*.pc
-.libs
 .sdk
 *.gcda
 *.gcno
@@ -109,9 +99,35 @@
 /pc-bios/optionrom/kvmvapic.img
 /pc-bios/s390-ccw/s390-ccw.elf
 /pc-bios/s390-ccw/s390-ccw.img
+/docs/qemu-ga-qapi.texi
+/docs/qemu-ga-ref.html
+/docs/qemu-ga-ref.info*
+/docs/qemu-ga-ref.txt
+/docs/qemu-qmp-qapi.texi
+/docs/qemu-qmp-ref.html
+/docs/qemu-qmp-ref.info*
+/docs/qemu-qmp-ref.txt
+/docs/version.texi
+*.tps
 .stgit-*
 cscope.*
 tags
 TAGS
 docker-src.*
 *~
+trace.h
+trace.c
+trace-ust.h
+trace-ust.h
+trace-dtrace.h
+trace-dtrace.dtrace
+trace-root.h
+trace-root.c
+trace-ust-root.h
+trace-ust-root.h
+trace-ust-all.h
+trace-ust-all.c
+trace-dtrace-root.h
+trace-dtrace-root.dtrace
+trace-ust-all.h
+trace-ust-all.c
diff --git a/.shippable.yml b/.shippable.yml
new file mode 100644
index 0000000..653bd75
--- /dev/null
+++ b/.shippable.yml
@@ -0,0 +1,21 @@
+language: c
+env:
+  matrix:
+    - IMAGE=debian-armhf-cross
+      TARGET_LIST=arm-softmmu,arm-linux-user
+    - IMAGE=debian-arm64-cross
+      TARGET_LIST=aarch64-softmmu,aarch64-linux-user
+    - IMAGE=debian-s390x-cross
+      TARGET_LIST=s390x-softmmu,s390x-linux-user
+build:
+  pre_ci:
+    - make docker-image-${IMAGE}
+  pre_ci_boot:
+    image_name: qemu
+    image_tag: ${IMAGE}
+    pull: false
+    options: "-e HOME=/root"
+  ci:
+    - unset CC
+    - ./configure ${QEMU_CONFIGURE_OPTS} --target-list=${TARGET_LIST}
+    - make -j2
diff --git a/.travis.yml b/.travis.yml
index 9916178..9008a79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ python:
   - "2.4"
 compiler:
   - gcc
-  - clang
 cache: ccache
 addons:
   apt:
@@ -68,6 +67,9 @@ script:
   - make -j3 && ${TEST_CMD}
 matrix:
   include:
+    # Test with CLang for compile portability
+    - env: CONFIG=""
+      compiler: clang
     # gprof/gcov are GCC features
     - env: CONFIG="--enable-gprof --enable-gcov --disable-pie"
       compiler: gcc
@@ -90,8 +92,8 @@ matrix:
     - env: CONFIG=""
       os: osx
       compiler: clang
-    # Plain Trusty Build
-    - env: CONFIG=""
+    # Plain Trusty System Build
+    - env: CONFIG="--disable-linux-user"
       sudo: required
       addons:
       dist: trusty
@@ -101,6 +103,55 @@ matrix:
         - sudo apt-get build-dep -qq qemu
         - wget -O - 
http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ
         - git submodule update --init --recursive
+    # Plain Trusty Linux User Build
+    - env: CONFIG="--disable-system"
+      sudo: required
+      addons:
+      dist: trusty
+      compiler: gcc
+      before_install:
+        - sudo apt-get update -qq
+        - sudo apt-get build-dep -qq qemu
+        - wget -O - 
http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ
+        - git submodule update --init --recursive
+    # Trusty System build with latest stable clang
+    - sudo: required
+      addons:
+      dist: trusty
+      language: generic
+      compiler: none
+      env:
+        - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9
+        - CONFIG="--disable-linux-user --cc=clang-3.9 --cxx=clang++-3.9"
+      before_install:
+        - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo 
apt-key add -
+        - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty 
llvm-toolchain-trusty-3.9 main'
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq -y clang-3.9
+        - sudo apt-get build-dep -qq qemu
+        - wget -O - 
http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ
+        - git submodule update --init --recursive
+      before_script:
+        - ./configure ${CONFIG} || cat config.log
+    # Trusty Linux User build with latest stable clang
+    - sudo: required
+      addons:
+      dist: trusty
+      language: generic
+      compiler: none
+      env:
+        - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9
+        - CONFIG="--disable-system --cc=clang-3.9 --cxx=clang++-3.9"
+      before_install:
+        - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo 
apt-key add -
+        - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty 
llvm-toolchain-trusty-3.9 main'
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq -y clang-3.9
+        - sudo apt-get build-dep -qq qemu
+        - wget -O - 
http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ
+        - git submodule update --init --recursive
+      before_script:
+        - ./configure ${CONFIG} || cat config.log
     # Using newer GCC with sanitizers
     - addons:
         apt:
diff --git a/CODING_STYLE b/CODING_STYLE
index f53180b..2fa0c0b 100644
--- a/CODING_STYLE
+++ b/CODING_STYLE
@@ -116,3 +116,10 @@ if (a == 1) {
 Rationale: Yoda conditions (as in 'if (1 == a)') are awkward to read.
 Besides, good compilers already warn users when '==' is mis-typed as '=',
 even when the constant is on the right.
+
+7. Comment style
+
+We use traditional C-style /* */ comments and avoid // comments.
+
+Rationale: The // form is valid in C99, so this is purely a matter of
+consistency of style. The checkpatch script will warn you about this.
diff --git a/HACKING b/HACKING
index 20a9101..4125c97 100644
--- a/HACKING
+++ b/HACKING
@@ -1,10 +1,28 @@
 1. Preprocessor
 
+1.1. Variadic macros
+
 For variadic macros, stick with this C99-like syntax:
 
 #define DPRINTF(fmt, ...)                                       \
     do { printf("IRQ: " fmt, ## __VA_ARGS__); } while (0)
 
+1.2. Include directives
+
+Order include directives as follows:
+
+#include "qemu/osdep.h"  /* Always first... */
+#include <...>           /* then system headers... */
+#include "..."           /* and finally QEMU headers. */
+
+The "qemu/osdep.h" header contains preprocessor macros that affect the behavior
+of core system headers like <stdint.h>.  It must be the first include so that
+core system headers included by external libraries get the preprocessor macros
+that QEMU depends on.
+
+Do not include "qemu/osdep.h" from header files since the .c file will have
+already included it.
+
 2. C types
 
 It should be common sense to use the right type, but we have collected
diff --git a/MAINTAINERS b/MAINTAINERS
index 4a60579..c60235e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -106,7 +106,7 @@ F: include/fpu/
 Alpha
 M: Richard Henderson <rth@xxxxxxxxxxx>
 S: Maintained
-F: target-alpha/
+F: target/alpha/
 F: hw/alpha/
 F: tests/tcg/alpha/
 F: disas/alpha.c
@@ -115,7 +115,7 @@ ARM
 M: Peter Maydell <peter.maydell@xxxxxxxxxx>
 L: qemu-arm@xxxxxxxxxx
 S: Maintained
-F: target-arm/
+F: target/arm/
 F: hw/arm/
 F: hw/cpu/a*mpcore.c
 F: include/hw/cpu/a*mpcore.h
@@ -126,16 +126,22 @@ F: disas/libvixl/
 CRIS
 M: Edgar E. Iglesias <edgar.iglesias@xxxxxxxxx>
 S: Maintained
-F: target-cris/
+F: target/cris/
 F: hw/cris/
 F: include/hw/cris/
 F: tests/tcg/cris/
 F: disas/cris.c
 
+HPPA (PA-RISC)
+M: Richard Henderson <rth@xxxxxxxxxxx>
+S: Maintained
+F: target/hppa/
+F: disas/hppa.c
+
 LM32
 M: Michael Walle <michael@xxxxxxxx>
 S: Maintained
-F: target-lm32/
+F: target/lm32/
 F: disas/lm32.c
 F: hw/lm32/
 F: hw/*/lm32_*
@@ -147,13 +153,13 @@ F: tests/tcg/lm32/
 M68K
 M: Laurent Vivier <laurent@xxxxxxxxx>
 S: Maintained
-F: target-m68k/
+F: target/m68k/
 F: disas/m68k.c
 
 MicroBlaze
 M: Edgar E. Iglesias <edgar.iglesias@xxxxxxxxx>
 S: Maintained
-F: target-microblaze/
+F: target/microblaze/
 F: hw/microblaze/
 F: disas/microblaze.c
 
@@ -161,7 +167,7 @@ MIPS
 M: Aurelien Jarno <aurelien@xxxxxxxxxxx>
 M: Yongbok Kim <yongbok.kim@xxxxxxxxxx>
 S: Maintained
-F: target-mips/
+F: target/mips/
 F: hw/mips/
 F: hw/misc/mips_*
 F: hw/intc/mips_gic.c
@@ -176,15 +182,23 @@ F: disas/mips.c
 Moxie
 M: Anthony Green <green@xxxxxxxxxxxxxx>
 S: Maintained
-F: target-moxie/
+F: target/moxie/
 F: disas/moxie.c
 F: hw/moxie/
 F: default-configs/moxie-softmmu.mak
 
+NiosII
+M: Chris Wulff <crwulff@xxxxxxxxx>
+M: Marek Vasut <marex@xxxxxxx>
+S: Maintained
+F: target/nios2/
+F: hw/nios2/
+F: disas/nios2.c
+
 OpenRISC
 M: Jia Liu <proljc@xxxxxxxxx>
 S: Maintained
-F: target-openrisc/
+F: target/openrisc/
 F: hw/openrisc/
 F: tests/tcg/openrisc/
 
@@ -193,7 +207,7 @@ M: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
 M: Alexander Graf <agraf@xxxxxxx>
 L: qemu-ppc@xxxxxxxxxx
 S: Maintained
-F: target-ppc/
+F: target/ppc/
 F: hw/ppc/
 F: include/hw/ppc/
 F: disas/ppc.c
@@ -202,14 +216,14 @@ S390
 M: Richard Henderson <rth@xxxxxxxxxxx>
 M: Alexander Graf <agraf@xxxxxxx>
 S: Maintained
-F: target-s390x/
+F: target/s390x/
 F: hw/s390x/
 F: disas/s390.c
 
 SH4
 M: Aurelien Jarno <aurelien@xxxxxxxxxxx>
 S: Odd Fixes
-F: target-sh4/
+F: target/sh4/
 F: hw/sh4/
 F: disas/sh4.c
 F: include/hw/sh4/
@@ -218,7 +232,7 @@ SPARC
 M: Mark Cave-Ayland <mark.cave-ayland@xxxxxxxxxxxx>
 M: Artyom Tarasenko <atar4qemu@xxxxxxxxx>
 S: Maintained
-F: target-sparc/
+F: target/sparc/
 F: hw/sparc/
 F: hw/sparc64/
 F: disas/sparc.c
@@ -226,7 +240,7 @@ F: disas/sparc.c
 UniCore32
 M: Guan Xuetao <gxt@xxxxxxxxxxxxxxx>
 S: Maintained
-F: target-unicore32/
+F: target/unicore32/
 F: hw/unicore32/
 F: include/hw/unicore32/
 
@@ -235,7 +249,7 @@ M: Paolo Bonzini <pbonzini@xxxxxxxxxx>
 M: Richard Henderson <rth@xxxxxxxxxxx>
 M: Eduardo Habkost <ehabkost@xxxxxxxxxx>
 S: Maintained
-F: target-i386/
+F: target/i386/
 F: hw/i386/
 F: disas/i386.c
 
@@ -243,14 +257,14 @@ Xtensa
 M: Max Filippov <jcmvbkbc@xxxxxxxxx>
 W: http://wiki.osll.spb.ru/doku.php?id=etc:users:jcmvbkbc:qemu-target-xtensa
 S: Maintained
-F: target-xtensa/
+F: target/xtensa/
 F: hw/xtensa/
 F: tests/tcg/xtensa/
 
 TriCore
 M: Bastian Koppelmann <kbastian@xxxxxxxxxxxxxxxxxxxxx>
 S: Maintained
-F: target-tricore/
+F: target/tricore/
 F: hw/tricore/
 F: include/hw/tricore/
 
@@ -269,26 +283,26 @@ ARM
 M: Peter Maydell <peter.maydell@xxxxxxxxxx>
 L: qemu-arm@xxxxxxxxxx
 S: Maintained
-F: target-arm/kvm.c
+F: target/arm/kvm.c
 
 MIPS
 M: James Hogan <james.hogan@xxxxxxxxxx>
 S: Maintained
-F: target-mips/kvm.c
+F: target/mips/kvm.c
 
 PPC
 M: Alexander Graf <agraf@xxxxxxx>
 S: Maintained
-F: target-ppc/kvm.c
+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: target-s390x/ioinst.[ch]
-F: target-s390x/machine.c
+F: target/s390x/kvm.c
+F: target/s390x/ioinst.[ch]
+F: target/s390x/machine.c
 F: hw/intc/s390_flic.c
 F: hw/intc/s390_flic_kvm.c
 F: include/hw/s390x/s390_flic.h
@@ -301,7 +315,7 @@ M: Paolo Bonzini <pbonzini@xxxxxxxxxx>
 M: Marcelo Tosatti <mtosatti@xxxxxxxxxx>
 L: kvm@xxxxxxxxxxxxxxx
 S: Supported
-F: target-i386/kvm.c
+F: target/i386/kvm.c
 
 Guest CPU Cores (Xen):
 ----------------------
@@ -309,7 +323,7 @@ Guest CPU Cores (Xen):
 X86
 M: Stefano Stabellini <sstabellini@xxxxxxxxxx>
 M: Anthony Perard <anthony.perard@xxxxxxxxxx>
-L: xen-devel@xxxxxxxxxxxxxxxxxxx
+L: xen-devel@xxxxxxxxxxxxxxxxxxxx
 S: Supported
 F: xen-*
 F: */xen*
@@ -508,7 +522,6 @@ M: Shannon Zhao <shannon.zhao@xxxxxxxxxx>
 L: qemu-arm@xxxxxxxxxx
 S: Maintained
 F: hw/arm/virt-acpi-build.c
-F: include/hw/arm/virt-acpi-build.h
 
 STM32F205
 M: Alistair Francis <alistair@xxxxxxxxxxxxx>
@@ -548,20 +561,19 @@ F: hw/lm32/milkymist.c
 M68K Machines
 -------------
 an5206
-S: Orphan
+M: Thomas Huth <huth@xxxxxxxxxxxxx>
+S: Odd Fixes
 F: hw/m68k/an5206.c
 F: hw/m68k/mcf5206.c
 
-dummy_m68k
-S: Orphan
-F: hw/m68k/dummy_m68k.c
-
 mcf5208
-S: Orphan
+M: Thomas Huth <huth@xxxxxxxxxxxxx>
+S: Odd Fixes
 F: hw/m68k/mcf5208.c
 F: hw/m68k/mcf_intc.c
 F: hw/char/mcf_uart.c
 F: hw/net/mcf_fec.c
+F: include/hw/m68k/mcf*.h
 
 MicroBlaze Machines
 -------------------
@@ -588,15 +600,28 @@ S: Maintained
 F: hw/mips/mips_malta.c
 
 Mipssim
-L: qemu-devel@xxxxxxxxxx
-S: Orphan
+M: Yongbok Kim <yongbok.kim@xxxxxxxxxx>
+S: Odd Fixes
 F: hw/mips/mips_mipssim.c
+F: hw/net/mipsnet.c
 
 R4000
 M: Aurelien Jarno <aurelien@xxxxxxxxxxx>
 S: Maintained
 F: hw/mips/mips_r4k.c
 
+Fulong 2E
+M: Yongbok Kim <yongbok.kim@xxxxxxxxxx>
+S: Odd Fixes
+F: hw/mips/mips_fulong2e.c
+
+Boston
+M: Paul Burton <paul.burton@xxxxxxxxxx>
+S: Maintained
+F: hw/core/loader-fit.c
+F: hw/mips/boston.c
+F: hw/pci-host/xilinx-pcie.c
+
 OpenRISC Machines
 -----------------
 or1k-sim
@@ -658,10 +683,13 @@ F: hw/misc/macio/
 F: hw/intc/heathrow_pic.c
 
 PReP
+M: Hervé Poussineau <hpoussin@xxxxxxxxxxx>
 L: qemu-devel@xxxxxxxxxx
 L: qemu-ppc@xxxxxxxxxx
-S: Odd Fixes
+S: Maintained
 F: hw/ppc/prep.c
+F: hw/ppc/prep_systemio.c
+F: hw/ppc/rs6000_mc.c
 F: hw/pci-host/prep.[hc]
 F: hw/isa/pc87312.[hc]
 F: pc-bios/ppc_rom.bin
@@ -726,6 +754,13 @@ S: Maintained
 F: hw/sparc64/sun4u.c
 F: pc-bios/openbios-sparc64
 
+Sun4v
+M: Artyom Tarasenko <atar4qemu@xxxxxxxxx>
+S: Maintained
+F: hw/sparc64/sun4v.c
+F: hw/timer/sun4v-rtc.c
+F: include/hw/timer/sun4v-rtc.h
+
 Leon3
 M: Fabien Chouteau <chouteau@xxxxxxxxxxx>
 S: Maintained
@@ -807,6 +842,7 @@ M: Eduardo Habkost <ehabkost@xxxxxxxxxx>
 M: Marcel Apfelbaum <marcel@xxxxxxxxxx>
 S: Supported
 F: hw/core/machine.c
+F: hw/core/null-machine.c
 F: include/hw/boards.h
 
 Xtensa Machines
@@ -885,7 +921,8 @@ F: hw/acpi/*
 F: hw/smbios/*
 F: hw/i386/acpi-build.[hc]
 F: hw/arm/virt-acpi-build.c
-F: include/hw/arm/virt-acpi-build.h
+F: tests/bios-tables-test.c
+F: tests/acpi-utils.[hc]
 
 ppc4xx
 M: Alexander Graf <agraf@xxxxxxx>
@@ -1011,7 +1048,7 @@ F: hw/input/virtio-input*.c
 F: include/hw/virtio/virtio-input.h
 
 virtio-serial
-M: Amit Shah <amit.shah@xxxxxxxxxx>
+M: Amit Shah <amit@xxxxxxxxxx>
 S: Supported
 F: hw/char/virtio-serial-bus.c
 F: hw/char/virtio-console.c
@@ -1020,7 +1057,7 @@ F: tests/virtio-console-test.c
 F: tests/virtio-serial-test.c
 
 virtio-rng
-M: Amit Shah <amit.shah@xxxxxxxxxx>
+M: Amit Shah <amit@xxxxxxxxxx>
 S: Supported
 F: hw/virtio/virtio-rng.c
 F: include/hw/virtio/virtio-rng.h
@@ -1100,6 +1137,15 @@ F: hw/nvram/chrp_nvram.c
 F: include/hw/nvram/chrp_nvram.h
 F: tests/prom-env-test.c
 
+VM Generation ID
+M: Ben Warren <ben@xxxxxxxxxxxxxxxxxx>
+S: Maintained
+F: hw/acpi/vmgenid.c
+F: include/hw/acpi/vmgenid.h
+F: docs/specs/vmgenid.txt
+F: tests/vmgenid-test.c
+F: stubs/vmgenid.c
+
 Subsystems
 ----------
 Audio
@@ -1174,8 +1220,9 @@ T: git git://github.com/jnsnow/qemu.git bitmaps
 
 Character device backends
 M: Paolo Bonzini <pbonzini@xxxxxxxxxx>
+M: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
 S: Maintained
-F: qemu-char.c
+F: chardev/
 F: backends/msmouse.c
 F: backends/testdev.c
 
@@ -1184,6 +1231,15 @@ M: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
 S: Maintained
 F: backends/baum.c
 
+Command line option argument parsing
+M: Markus Armbruster <armbru@xxxxxxxxxx>
+S: Supported
+F: include/qemu/option.h
+F: tests/test-keyval.c
+F: tests/test-qemu-opts.c
+F: util/keyval.c
+F: util/qemu-option.c
+
 Coverity model
 M: Markus Armbruster <armbru@xxxxxxxxxx>
 S: Supported
@@ -1318,7 +1374,9 @@ X: include/qapi/qmp/
 F: include/qapi/qmp/dispatch.h
 F: tests/qapi-schema/
 F: tests/test-*-visitor.c
+F: tests/test-qapi-*.c
 F: tests/test-qmp-*.c
+F: tests/test-visitor-serialization.c
 F: scripts/qapi*
 F: docs/qapi*
 T: git git://repo.or.cz/qemu/armbru.git qapi-next
@@ -1370,6 +1428,7 @@ F: qmp.c
 F: monitor.c
 F: docs/*qmp-*
 F: scripts/qmp/
+F: tests/qmp-test.c
 T: git git://repo.or.cz/qemu/armbru.git qapi-next
 
 Register API
@@ -1407,7 +1466,7 @@ F: scripts/checkpatch.pl
 
 Migration
 M: Juan Quintela <quintela@xxxxxxxxxx>
-M: Amit Shah <amit.shah@xxxxxxxxxx>
+M: Dr. David Alan Gilbert <dgilbert@xxxxxxxxxx>
 S: Maintained
 F: include/migration/
 F: migration/
@@ -1496,6 +1555,7 @@ M: Riku Voipio <riku.voipio@xxxxxx>
 S: Maintained
 F: thunk.c
 F: user-exec.c
+F: user-exec-stub.c
 
 BSD user
 S: Orphan
@@ -1620,6 +1680,7 @@ M: Peter Lieven <pl@xxxxxxx>
 L: qemu-block@xxxxxxxxxx
 S: Supported
 F: block/iscsi.c
+F: block/iscsi-opts.c
 
 NFS
 M: Jeff Cody <jcody@xxxxxxxxxx>
@@ -1637,14 +1698,6 @@ S: Supported
 F: block/ssh.c
 T: git git://github.com/codyprime/qemu-kvm-jtc.git block
 
-ARCHIPELAGO
-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
@@ -1720,9 +1773,9 @@ L: qemu-block@xxxxxxxxxx
 S: Supported
 F: block/linux-aio.c
 F: include/block/raw-aio.h
-F: block/raw-posix.c
-F: block/raw-win32.c
-F: block/raw_bsd.c
+F: block/raw-format.c
+F: block/file-posix.c
+F: block/file-win32.c
 F: block/win32-aio.c
 
 qcow2
@@ -1775,9 +1828,14 @@ F: docs/block-replication.txt
 Build and test automation
 -------------------------
 M: Alex Bennée <alex.bennee@xxxxxxxxxx>
+M: Fam Zheng <famz@xxxxxxxxxx>
 L: qemu-devel@xxxxxxxxxx
-S: Supported
+S: Maintained
 F: .travis.yml
+F: .shippable.yml
+F: tests/docker/
+W: https://travis-ci.org/qemu/qemu
+W: http://patchew.org/QEMU/
 
 Documentation
 -------------
@@ -1786,9 +1844,3 @@ M: Daniel P. Berrange <berrange@xxxxxxxxxx>
 S: Odd Fixes
 F: docs/build-system.txt
 
-Docker testing
---------------
-Docker based testing framework and cases
-M: Fam Zheng <famz@xxxxxxxxxx>
-S: Maintained
-F: tests/docker/
diff --git a/Makefile b/Makefile
index 474cc5e..6c359b2 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ endif
 
 CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)
 CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)
+CONFIG_XEN := $(CONFIG_XEN_BACKEND)
 CONFIG_ALL=y
 -include config-all-devices.mak
 -include config-all-disas.mak
@@ -50,38 +51,153 @@ endif
 
 include $(SRC_PATH)/rules.mak
 
-GENERATED_HEADERS = qemu-version.h config-host.h qemu-options.def
-GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h
-GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c
-GENERATED_HEADERS += qmp-introspect.h
-GENERATED_SOURCES += qmp-introspect.c
+GENERATED_FILES = qemu-version.h config-host.h qemu-options.def
+GENERATED_FILES += qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h
+GENERATED_FILES += qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c
+GENERATED_FILES += qmp-introspect.h
+GENERATED_FILES += qmp-introspect.c
 
-GENERATED_HEADERS += trace/generated-tracers.h
-ifeq ($(findstring dtrace,$(TRACE_BACKENDS)),dtrace)
-GENERATED_HEADERS += trace/generated-tracers-dtrace.h
-endif
-GENERATED_SOURCES += trace/generated-tracers.c
+GENERATED_FILES += trace/generated-tcg-tracers.h
+
+GENERATED_FILES += trace/generated-helpers-wrappers.h
+GENERATED_FILES += trace/generated-helpers.h
+GENERATED_FILES += trace/generated-helpers.c
 
-GENERATED_HEADERS += trace/generated-tcg-tracers.h
+ifdef CONFIG_TRACE_UST
+GENERATED_FILES += trace-ust-all.h
+GENERATED_FILES += trace-ust-all.c
+endif
 
-GENERATED_HEADERS += trace/generated-helpers-wrappers.h
-GENERATED_HEADERS += trace/generated-helpers.h
-GENERATED_SOURCES += trace/generated-helpers.c
+GENERATED_FILES += module_block.h
 
-ifeq ($(findstring ust,$(TRACE_BACKENDS)),ust)
-GENERATED_HEADERS += trace/generated-ust-provider.h
-GENERATED_SOURCES += trace/generated-ust.c
+TRACE_HEADERS = trace-root.h $(trace-events-subdirs:%=%/trace.h)
+TRACE_SOURCES = trace-root.c $(trace-events-subdirs:%=%/trace.c)
+TRACE_DTRACE =
+ifdef CONFIG_TRACE_DTRACE
+TRACE_HEADERS += trace-dtrace-root.h $(trace-events-subdirs:%=%/trace-dtrace.h)
+TRACE_DTRACE += trace-dtrace-root.dtrace 
$(trace-events-subdirs:%=%/trace-dtrace.dtrace)
+endif
+ifdef CONFIG_TRACE_UST
+TRACE_HEADERS += trace-ust-root.h $(trace-events-subdirs:%=%/trace-ust.h)
 endif
 
-GENERATED_HEADERS += module_block.h
+GENERATED_FILES += $(TRACE_HEADERS)
+GENERATED_FILES += $(TRACE_SOURCES)
+GENERATED_FILES += $(BUILD_DIR)/trace-events-all
+
+trace-group-name = $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g')
+
+tracetool-y = $(SRC_PATH)/scripts/tracetool.py
+tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
+
+%/trace.h: %/trace.h-timestamp
+       @cmp $< $@ >/dev/null 2>&1 || cp $< $@
+%/trace.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y)
+       $(call quiet-command,$(TRACETOOL) \
+               --group=$(call trace-group-name,$@) \
+               --format=h \
+               --backends=$(TRACE_BACKENDS) \
+               $< > $@,"GEN","$(@:%-timestamp=%)")
+
+%/trace.c: %/trace.c-timestamp

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.