The following changes since commit 4829e0378dfb91d55af9dfd741bd09e8f2c4f91a:
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-03-18' into staging (2016-03-18 17:18:41 +0000) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to ba0fb75c6400fbf75e2e8b52d2c6e2e8e848777c: target-i386: implement PKE for TCG (2016-03-22 22:20:18 +0100) ---------------------------------------------------------------- * Log filtering from Alex and Peter * Chardev fixes from Daniel and Marc-André * config.status tweak from David * Header file tweaks from Markus, myself and Veronia (Outreachy candidate) * get_ticks_per_sec() removal from Rutuja (Outreachy candidate) * Coverity fix from myself * PKE implementation from myself, based on rth's XSAVE support ---------------------------------------------------------------- Alex Bennée (7): tcg: pass down TranslationBlock to tcg_code_gen qemu-log: correct help text for -d cpu qemu-log: new option -dfilter to limit output qemu-log: dfilter-ise exec, out_asm, op and opt_op target-arm: dfilter support for in_asm qemu-log: support simple pid substitution for logs cputlb: modernise the debug support Daniel P. Berrange (1): char: ensure all clients are in non-blocking mode Dr. David Alan Gilbert (1): config.status: Pass extra parameters Marc-André Lureau (1): char: translate from QIOChannel error to errno Markus Armbruster (12): include/qemu/osdep.h: Don't include qapi/error.h Use scripts/clean-includes to drop redundant qemu/typedefs.h Clean up includes some more fw_cfg: Split fw_cfg_keys.h off fw_cfg.h include/qemu/iov.h: Don't include qemu-common.h include/hw/hw.h: Don't include qemu-common.h hw/pci/pci.h: Don't include qemu-common.h Move HOST_LONG_BITS from qemu-common.h to qemu/osdep.h Move QEMU_ALIGN_*() from qemu-common.h to qemu/osdep.h Move ParallelIOArg from qemu-common.h to sysemu/char.h isa: Move DMA_transfer_handler from qemu-common.h to hw/isa/isa.h include/crypto: Include qapi-types.h or qemu/bswap.h instead of qemu-common.h Paolo Bonzini (3): hw: explicitly include qemu-common.h and cpu.h exec: fix error handling in file_ram_alloc target-i386: implement PKE for TCG Peter Maydell (2): qemu-log: Avoid function call for disabled qemu_log_mask logging qemu-log: Improve the "exec" TB execution logging Rutuja Shah (1): Replaced get_tick_per_sec() by NANOSECONDS_PER_SECOND Veronia Bahaa (1): util: move declarations out of qemu-common.h arch_init.c | 1 + async.c | 1 + audio/audio.c | 4 +- audio/noaudio.c | 8 +- audio/spiceaudio.c | 4 +- audio/wavaudio.c | 2 +- backends/baum.c | 3 +- backends/hostmem-file.c | 1 + backends/hostmem-ram.c | 1 + backends/hostmem.c | 1 + backends/rng-egd.c | 1 + backends/rng-random.c | 1 + backends/rng.c | 1 + backends/tpm.c | 1 + block.c | 3 +- block/archipelago.c | 2 +- block/backup.c | 2 + block/blkdebug.c | 3 +- block/blkverify.c | 2 + block/block-backend.c | 1 + block/bochs.c | 1 + block/cloop.c | 1 + block/commit.c | 1 + block/curl.c | 2 + block/dirty-bitmap.c | 2 +- block/dmg.c | 1 + block/gluster.c | 1 + block/io.c | 2 + block/mirror.c | 1 + block/nbd.c | 3 +- block/null.c | 1 + block/parallels.c | 1 + block/qapi.c | 1 + block/qcow.c | 1 + block/qcow2-cluster.c | 1 + block/qcow2-refcount.c | 1 + block/qcow2-snapshot.c | 3 +- block/qcow2.c | 2 +- block/qed.c | 3 +- block/qed.h | 1 + block/raw-aio.h | 2 + block/raw-posix.c | 3 +- block/raw-win32.c | 3 +- block/raw_bsd.c | 1 + block/rbd.c | 3 +- block/sheepdog.c | 3 +- block/snapshot.c | 1 + block/ssh.c | 1 + block/stream.c | 1 + block/vdi.c | 3 +- block/vhdx-log.c | 1 + block/vhdx.c | 1 + block/vmdk.c | 3 +- block/vpc.c | 1 + block/vvfat.c | 3 +- blockdev.c | 2 + bootdevice.c | 1 + bsd-user/elfload.c | 1 + bsd-user/main.c | 3 +- configure | 2 +- contrib/ivshmem-server/main.c | 3 +- cpu-exec.c | 21 +- cpus.c | 6 +- cputlb.c | 88 ++++----- crypto/block-luks.c | 1 + crypto/block-qcow.c | 1 + crypto/block.c | 1 + crypto/cipher.c | 1 + crypto/hash.c | 1 + crypto/init.c | 1 + crypto/ivgen-essiv.c | 2 + crypto/ivgen-plain.c | 2 + crypto/ivgen-plain64.c | 2 + crypto/ivgen.c | 2 + crypto/pbkdf-gcrypt.c | 1 + crypto/pbkdf-nettle.c | 1 + crypto/pbkdf-stub.c | 1 + crypto/pbkdf.c | 1 + crypto/secret.c | 1 + crypto/tlscreds.c | 1 + crypto/tlscredsanon.c | 1 + crypto/tlscredsx509.c | 1 + crypto/tlssession.c | 1 + device_tree.c | 1 + disas/i386.c | 2 + dump.c | 2 +- exec.c | 10 +- gdbstub.c | 5 +- hmp.c | 1 + hw/9pfs/9p-handle.c | 1 + hw/9pfs/9p-local.c | 1 + hw/9pfs/9p-proxy.c | 1 + hw/9pfs/9p-synth.c | 1 + hw/9pfs/9p.c | 1 + hw/acpi/core.c | 4 +- hw/acpi/cpu_hotplug.c | 1 + hw/acpi/ich9.c | 1 + hw/acpi/pcihp.c | 1 + hw/acpi/piix4.c | 1 + hw/alpha/dp264.c | 3 + hw/alpha/pci.c | 2 + hw/alpha/typhoon.c | 1 + hw/arm/allwinner-a10.c | 3 + hw/arm/armv7m.c | 3 + hw/arm/ast2400.c | 3 + hw/arm/bcm2835_peripherals.c | 1 + hw/arm/bcm2836.c | 3 + hw/arm/boot.c | 1 + hw/arm/cubieboard.c | 3 + hw/arm/digic.c | 1 + hw/arm/digic_boards.c | 3 + hw/arm/exynos4210.c | 3 + hw/arm/exynos4_boards.c | 2 + hw/arm/fsl-imx25.c | 3 + hw/arm/fsl-imx31.c | 3 + hw/arm/highbank.c | 1 + hw/arm/imx25_pdk.c | 3 + hw/arm/integratorcp.c | 3 + hw/arm/kzm.c | 3 + hw/arm/mainstone.c | 1 + hw/arm/musicpal.c | 3 + hw/arm/netduino2.c | 1 + hw/arm/nseries.c | 3 +- hw/arm/omap1.c | 22 ++- hw/arm/omap2.c | 3 + hw/arm/omap_sx1.c | 1 + hw/arm/palm.c | 1 + hw/arm/palmetto-bmc.c | 3 + hw/arm/pxa2xx.c | 4 + hw/arm/pxa2xx_pic.c | 2 + hw/arm/raspi.c | 3 + hw/arm/realview.c | 3 + hw/arm/spitz.c | 3 +- hw/arm/stellaris.c | 3 +- hw/arm/stm32f205_soc.c | 3 + hw/arm/strongarm.c | 4 +- hw/arm/sysbus-fdt.c | 1 + hw/arm/tosa.c | 1 + hw/arm/versatilepb.c | 3 + hw/arm/vexpress.c | 3 + hw/arm/virt-acpi-build.c | 1 + hw/arm/virt.c | 1 + hw/arm/xilinx_zynq.c | 3 + hw/arm/xlnx-ep108.c | 3 + hw/arm/xlnx-zynqmp.c | 3 + hw/audio/adlib.c | 3 +- hw/audio/gus.c | 1 + hw/audio/sb16.c | 4 +- hw/block/block.c | 1 + hw/block/dataplane/virtio-blk.c | 1 + hw/block/fdc.c | 5 +- hw/block/nand.c | 1 + hw/block/nvme.c | 1 + hw/block/nvme.h | 1 + hw/block/onenand.c | 1 + hw/block/pflash_cfi01.c | 1 + hw/block/pflash_cfi02.c | 9 +- hw/block/virtio-blk.c | 1 + hw/block/xen_disk.c | 1 + hw/bt/hci-csr.c | 4 +- hw/bt/hci.c | 2 + hw/char/cadence_uart.c | 4 +- hw/char/debugcon.c | 1 + hw/char/parallel.c | 1 + hw/char/serial-isa.c | 1 + hw/char/serial-pci.c | 1 + hw/char/serial.c | 11 +- hw/char/spapr_vty.c | 3 + hw/char/virtio-serial-bus.c | 1 + hw/core/loader.c | 2 + hw/core/machine.c | 2 + hw/core/nmi.c | 1 + hw/core/qdev-properties-system.c | 1 + hw/core/qdev-properties.c | 2 + hw/cpu/a15mpcore.c | 1 + hw/cpu/a9mpcore.c | 1 + hw/cpu/arm11mpcore.c | 1 + hw/cpu/realview_mpcore.c | 1 + hw/cris/axis_dev88.c | 3 + hw/cris/boot.c | 3 + hw/display/bcm2835_fb.c | 1 + hw/display/cg3.c | 1 + hw/display/cirrus_vga.c | 1 + hw/display/sm501.c | 3 + hw/display/tc6393xb.c | 1 + hw/display/tcx.c | 2 + hw/display/vga.c | 7 +- hw/display/vmware_vga.c | 1 + hw/dma/bcm2835_dma.c | 1 + hw/dma/i8257.c | 2 +- hw/dma/pl330.c | 1 + hw/dma/rc4030.c | 2 +- hw/dma/xilinx_axidma.c | 1 + hw/i386/acpi-build.c | 1 + hw/i386/acpi-build.h | 2 - hw/i386/kvm/i8254.c | 1 + hw/i386/kvm/pci-assign.c | 1 + hw/i386/multiboot.c | 2 + hw/i386/pc_sysfw.c | 1 + hw/i386/pci-assign-load-rom.c | 1 + hw/i386/xen/xen_platform.c | 1 + hw/i386/xen/xen_pvdevice.c | 1 + hw/ide/core.c | 5 +- hw/ide/qdev.c | 1 + hw/input/hid.c | 2 +- hw/input/milkymist-softusb.c | 1 + hw/input/tsc2005.c | 3 +- hw/input/tsc210x.c | 3 +- hw/input/virtio-input-host.c | 1 + hw/input/virtio-input.c | 1 + hw/intc/apic_common.c | 1 + hw/intc/arm_gic.c | 1 + hw/intc/arm_gic_common.c | 1 + hw/intc/arm_gic_kvm.c | 1 + hw/intc/arm_gicv2m.c | 1 + hw/intc/arm_gicv3_common.c | 1 + hw/intc/arm_gicv3_kvm.c | 1 + hw/intc/armv7m_nvic.c | 2 + hw/intc/i8259.c | 2 +- hw/intc/ioapic_common.c | 1 + hw/intc/openpic.c | 1 + hw/intc/openpic_kvm.c | 1 + hw/intc/realview_gic.c | 1 + hw/intc/sh_intc.c | 2 + hw/intc/xics.c | 3 + hw/intc/xics_kvm.c | 3 + hw/ipack/ipack.c | 1 + hw/ipmi/ipmi_bmc_extern.c | 1 + hw/ipmi/isa_ipmi_bt.c | 1 + hw/ipmi/isa_ipmi_kcs.c | 1 + hw/isa/isa-bus.c | 1 + hw/isa/lpc_ich9.c | 1 + hw/isa/pc87312.c | 1 + hw/lm32/lm32_boards.c | 2 + hw/lm32/lm32_hwsetup.h | 1 + hw/lm32/milkymist.c | 3 + hw/m68k/an5206.c | 3 + hw/m68k/dummy_m68k.c | 2 + hw/m68k/mcf5206.c | 2 + hw/m68k/mcf5208.c | 3 + hw/m68k/mcf_intc.c | 2 + hw/mem/pc-dimm.c | 1 + hw/microblaze/boot.c | 3 + hw/microblaze/petalogix_ml605_mmu.c | 3 + hw/microblaze/petalogix_s3adsp1800_mmu.c | 3 + hw/mips/mips_fulong2e.c | 1 + hw/mips/mips_jazz.c | 1 + hw/mips/mips_malta.c | 2 + hw/mips/mips_mipssim.c | 3 + hw/mips/mips_r4k.c | 3 + hw/misc/arm_sysctl.c | 3 +- hw/misc/bcm2835_mbox.c | 1 + hw/misc/bcm2835_property.c | 1 + hw/misc/cbus.c | 2 +- hw/misc/ivshmem.c | 2 + hw/misc/macio/cuda.c | 17 +- hw/misc/macio/macio.c | 3 +- hw/misc/tmp105.c | 1 + hw/moxie/moxiesim.c | 3 + hw/net/dp8393x.c | 3 +- hw/net/milkymist-minimac2.c | 3 + hw/net/ne2000-isa.c | 1 + hw/net/spapr_llan.c | 2 + hw/net/vmxnet_rx_pkt.h | 2 - hw/net/vmxnet_tx_pkt.h | 2 - hw/net/xilinx_axienet.c | 1 + hw/net/xilinx_ethlite.c | 2 + hw/nvram/fw_cfg.c | 1 + hw/nvram/mac_nvram.c | 1 + hw/nvram/spapr_nvram.c | 3 + hw/openrisc/openrisc_sim.c | 3 + hw/pci-bridge/pci_bridge_dev.c | 1 + hw/pci-host/piix.c | 1 + hw/pci-host/prep.c | 1 + hw/pci-host/q35.c | 1 + hw/pci/pci.c | 1 + hw/pci/pcie.c | 1 + hw/pci/shpc.c | 1 + hw/ppc/e500.c | 1 + hw/ppc/mac_newworld.c | 2 + hw/ppc/mac_oldworld.c | 2 + hw/ppc/mpc8544_guts.c | 2 + hw/ppc/ppc.c | 23 ++- hw/ppc/ppc405_boards.c | 3 + hw/ppc/ppc405_uc.c | 7 +- hw/ppc/ppc_booke.c | 4 +- hw/ppc/prep.c | 1 + hw/ppc/spapr.c | 3 +- hw/ppc/spapr_drc.c | 3 + hw/ppc/spapr_events.c | 4 +- hw/ppc/spapr_hcall.c | 1 + hw/ppc/spapr_pci.c | 3 + hw/ppc/spapr_pci_vfio.c | 3 + hw/ppc/spapr_rng.c | 3 + hw/ppc/spapr_rtas.c | 1 + hw/ppc/spapr_rtc.c | 1 + hw/ppc/spapr_vio.c | 1 + hw/s390x/event-facility.c | 1 + hw/s390x/ipl.c | 1 + hw/s390x/s390-pci-bus.c | 2 + hw/s390x/s390-pci-inst.c | 2 + hw/s390x/s390-virtio-ccw.c | 3 + hw/s390x/s390-virtio.c | 1 + hw/s390x/sclp.c | 1 + hw/s390x/virtio-ccw.c | 1 + hw/scsi/esp-pci.c | 1 + hw/scsi/esp.c | 1 + hw/scsi/scsi-bus.c | 2 + hw/scsi/scsi-disk.c | 3 +- hw/scsi/scsi-generic.c | 1 + hw/scsi/spapr_vscsi.c | 2 + hw/scsi/vhost-scsi.c | 2 + hw/scsi/virtio-scsi-dataplane.c | 1 - hw/scsi/virtio-scsi.c | 1 + hw/scsi/vmw_pvscsi.c | 1 + hw/sd/pxa2xx_mmci.c | 1 + hw/sd/sd.c | 1 + hw/sd/sdhci-internal.h | 2 +- hw/sh4/r2d.c | 3 + hw/sh4/shix.c | 3 + hw/smbios/smbios.c | 1 + hw/sparc/leon3.c | 3 + hw/sparc/sun4m.c | 4 + hw/sparc64/sun4u.c | 8 +- hw/timer/a9gtimer.c | 1 + hw/timer/arm_mptimer.c | 1 + hw/timer/ds1338.c | 2 + hw/timer/exynos4210_rtc.c | 1 + hw/timer/hpet.c | 1 + hw/timer/i8254.c | 4 +- hw/timer/i8254_common.c | 6 +- hw/timer/m48t59.c | 2 + hw/timer/mc146818rtc.c | 17 +- hw/timer/omap_gptimer.c | 2 +- hw/timer/omap_synctimer.c | 3 +- hw/timer/pl031.c | 11 +- hw/timer/pxa2xx_timer.c | 18 +- hw/timer/twl92230.c | 1 + hw/tpm/tpm_tis.c | 1 + hw/tricore/tricore_testboard.c | 3 + hw/unicore32/puv3.c | 3 + hw/usb/bus.c | 2 + hw/usb/dev-hid.c | 1 + hw/usb/dev-hub.c | 1 + hw/usb/dev-mtp.c | 2 + hw/usb/dev-network.c | 2 + hw/usb/dev-serial.c | 2 + hw/usb/dev-smartcard-reader.c | 1 + hw/usb/dev-storage.c | 2 + hw/usb/hcd-ehci.c | 6 +- hw/usb/hcd-musb.c | 2 +- hw/usb/hcd-ohci.c | 11 +- hw/usb/hcd-uhci.c | 7 +- hw/usb/host-libusb.c | 1 + hw/usb/redirect.c | 1 + hw/usb/tusb6010.c | 6 +- hw/vfio/platform.c | 1 + hw/virtio/vhost-user.c | 1 + hw/virtio/vhost.c | 1 + hw/virtio/virtio-pci.c | 1 + hw/virtio/virtio-rng.c | 1 + hw/virtio/virtio.c | 4 +- hw/watchdog/watchdog.c | 2 +- hw/watchdog/wdt_diag288.c | 2 +- hw/watchdog/wdt_ib700.c | 2 +- hw/xen/xen-host-pci-device.c | 2 + hw/xen/xen_pt.c | 1 + hw/xen/xen_pt_config_init.c | 1 + hw/xen/xen_pt_graphics.c | 1 + hw/xtensa/sim.c | 3 + hw/xtensa/xtfpga.c | 3 + include/block/accounting.h | 2 - include/block/aio.h | 1 - include/block/block.h | 2 +- include/block/write-threshold.h | 2 - include/crypto/cipher.h | 2 +- include/crypto/hash.h | 2 +- include/crypto/init.h | 2 - include/crypto/secret.h | 1 - include/crypto/tlscreds.h | 1 - include/exec/cpu-common.h | 1 - include/exec/exec-all.h | 5 + include/exec/memory.h | 1 - include/hw/acpi/acpi.h | 3 +- include/hw/acpi/pcihp.h | 1 - include/hw/acpi/piix4.h | 2 - include/hw/acpi/tco.h | 1 - include/hw/boards.h | 1 - include/hw/char/digic-uart.h | 1 - include/hw/hotplug.h | 1 - include/hw/hw.h | 4 +- include/hw/i386/pc.h | 1 - include/hw/isa/i8257.h | 2 +- include/hw/isa/isa.h | 5 +- include/hw/nvram/fw_cfg.h | 50 +---- include/hw/nvram/fw_cfg_keys.h | 46 +++++ include/hw/pci/pci.h | 11 +- include/hw/ppc/mac_dbdma.h | 1 + include/hw/qdev-core.h | 1 - include/hw/scsi/scsi.h | 1 - include/hw/timer/digic-timer.h | 1 - include/hw/usb.h | 1 + include/hw/vfio/vfio.h | 2 - include/hw/xen/xen.h | 1 - include/monitor/qdev.h | 1 - include/net/filter.h | 1 - include/qapi/error.h | 5 - include/qapi/visitor.h | 1 - include/qemu-common.h | 321 ------------------------------- include/qemu/bcd.h | 15 ++ include/qemu/bswap.h | 6 +- include/qemu/coroutine.h | 1 - include/qemu/cutils.h | 183 ++++++++++++++++++ include/qemu/help_option.h | 22 +++ include/qemu/id.h | 13 ++ include/qemu/iov.h | 30 ++- include/qemu/log.h | 28 ++- include/qemu/option.h | 1 - include/qemu/osdep.h | 24 ++- include/qemu/path.h | 7 + include/qemu/range.h | 1 - include/qemu/timer.h | 10 +- include/qemu/typedefs.h | 2 + include/qemu/unicode.h | 6 + include/qom/cpu.h | 1 - include/qom/object.h | 2 +- include/sysemu/accel.h | 1 - include/sysemu/block-backend.h | 2 +- include/sysemu/char.h | 5 + include/sysemu/memory_mapping.h | 1 - include/sysemu/replay.h | 1 - include/sysemu/sysemu.h | 1 - include/ui/console.h | 1 - include/ui/qemu-pixman.h | 2 - include/ui/qemu-spice.h | 2 +- io/channel-command.c | 1 + io/channel-file.c | 1 + io/channel-socket.c | 1 + io/channel-tls.c | 1 + io/channel-websock.c | 1 + io/channel.c | 1 + io/task.c | 1 + iohandler.c | 1 + linux-user/elfload.c | 1 + linux-user/main.c | 4 +- linux-user/syscall.c | 2 + linux-user/uaccess.c | 1 + main-loop.c | 3 +- memory.c | 1 + memory_mapping.c | 1 + migration/block.c | 2 + migration/exec.c | 1 + migration/fd.c | 1 + migration/migration.c | 2 +- migration/ram.c | 1 + migration/rdma.c | 2 + migration/savevm.c | 3 +- migration/xbzrle.c | 2 +- monitor.c | 5 +- nbd/client.c | 1 + nbd/common.c | 1 + nbd/server.c | 1 + net/dump.c | 1 + net/filter-buffer.c | 1 + net/filter.c | 1 + net/net.c | 2 + net/netmap.c | 1 + net/slirp.c | 1 + net/socket.c | 1 + net/tap-aix.c | 1 + net/tap-bsd.c | 3 +- net/tap-haiku.c | 1 + net/tap-linux.c | 3 +- net/tap-solaris.c | 2 + net/tap.c | 2 + os-posix.c | 1 + pc-bios/optionrom/optionrom.h | 3 +- qapi/opts-visitor.c | 3 +- qapi/qapi-util.c | 1 + qapi/qapi-visit-core.c | 1 + qapi/qmp-dispatch.c | 1 + qapi/qmp-input-visitor.c | 1 + qapi/string-input-visitor.c | 1 + qdev-monitor.c | 1 + qemu-char.c | 11 +- qemu-img.c | 3 +- qemu-io-cmds.c | 2 + qemu-io.c | 1 + qemu-nbd.c | 2 + qemu-options.hx | 18 ++ qga/channel-posix.c | 1 + qga/commands-posix.c | 1 + qga/commands.c | 1 + qga/main.c | 2 +- qga/vss-win32/requester.cpp | 1 - qmp.c | 2 +- qobject/json-parser.c | 2 +- qobject/qdict.c | 1 + qobject/qjson.c | 1 + qom/cpu.c | 1 + qom/object.c | 3 +- qom/object_interfaces.c | 1 + qom/qom-qobject.c | 1 + qtest.c | 1 + replay/replay-input.c | 1 + replay/replay.c | 1 + scripts/clean-includes | 5 +- scripts/qapi-types.py | 5 - scripts/qapi-visit.py | 1 + scripts/tracetool/backend/log.py | 6 +- scripts/tracetool/format/events_h.py | 2 - scripts/tracetool/format/h.py | 1 - scripts/tracetool/format/tcg_h.py | 2 - scripts/tracetool/format/ust_events_c.py | 1 - slirp/slirp.c | 1 + slirp/tftp.c | 1 + stubs/gdbstub.c | 2 - stubs/get-fd.c | 1 + stubs/target-get-monitor-def.c | 2 - stubs/target-monitor-defs.c | 2 - target-alpha/cpu.c | 1 + target-arm/arm-semi.c | 1 + target-arm/cpu.c | 1 + target-arm/cpu64.c | 1 + target-arm/translate-a64.c | 3 +- target-arm/translate.c | 3 +- target-cris/cpu.c | 1 + target-i386/cpu.c | 14 +- target-i386/cpu.h | 6 +- target-i386/fpu_helper.c | 27 +++ target-i386/helper.c | 22 +++ target-i386/helper.h | 2 + target-i386/kvm.c | 1 + target-i386/misc_helper.c | 27 +++ target-i386/translate.c | 18 +- target-lm32/cpu.c | 1 + target-m68k/cpu.c | 1 + target-microblaze/cpu.c | 1 + target-mips/cpu.c | 1 + target-moxie/cpu.c | 1 + target-openrisc/cpu.c | 1 + target-ppc/kvm.c | 5 +- target-ppc/mmu-hash64.c | 1 + target-ppc/mmu_helper.c | 1 + target-s390x/cpu.c | 2 + target-s390x/helper.c | 1 + target-sh4/cpu.c | 1 + target-sparc/cpu.c | 1 + target-tilegx/cpu.c | 1 + target-tricore/cpu.c | 1 + target-unicore32/cpu.c | 1 + target-xtensa/cpu.c | 1 + tcg/tcg.c | 14 +- tcg/tcg.h | 2 +- tests/Makefile | 4 + tests/boot-order-test.c | 4 +- tests/check-qom-proplist.c | 1 + tests/fw_cfg-test.c | 3 +- tests/io-channel-helpers.c | 1 + tests/libqos/malloc-pc.c | 3 +- tests/qom-test.c | 1 + tests/tcg/linux-test.c | 1 + tests/tcg/test-i386-fprem.c | 4 +- tests/test-aio.c | 1 + tests/test-base64.c | 2 +- tests/test-blockjob-txn.c | 1 + tests/test-crypto-afsplit.c | 1 + tests/test-crypto-block.c | 1 + tests/test-crypto-cipher.c | 1 + tests/test-crypto-ivgen.c | 1 + tests/test-crypto-pbkdf.c | 1 + tests/test-crypto-secret.c | 2 + tests/test-crypto-tlscredsx509.c | 1 + tests/test-crypto-tlssession.c | 1 + tests/test-cutils.c | 3 +- tests/test-io-channel-command.c | 1 + tests/test-io-channel-file.c | 2 +- tests/test-io-channel-socket.c | 1 + tests/test-io-task.c | 1 + tests/test-logging.c | 141 ++++++++++++++ tests/test-opts-visitor.c | 1 + tests/test-qemu-opts.c | 1 + tests/test-qmp-input-strict.c | 1 + tests/test-qmp-input-visitor.c | 1 + tests/test-qmp-output-visitor.c | 1 + tests/test-string-input-visitor.c | 1 + tests/test-string-output-visitor.c | 1 + tests/test-thread-pool.c | 1 + tests/test-throttle.c | 1 + tests/test-visitor-serialization.c | 1 + tests/test-xbzrle.c | 1 + trace/control.c | 1 + trace/control.h | 1 - trace/qmp.c | 1 - translate-all.c | 5 +- ui/egl-helpers.c | 1 - ui/gtk.c | 1 + ui/input-linux.c | 1 + ui/sdl.c | 1 + ui/vnc-auth-sasl.c | 1 + ui/vnc-auth-vencrypt.c | 1 + ui/vnc-ws.c | 1 + ui/vnc.c | 1 + util/base64.c | 1 + util/cutils.c | 33 ++++ util/error.c | 1 + util/event_notifier-posix.c | 1 + util/id.c | 1 + util/iov.c | 2 + util/log.c | 121 ++++++++++-- util/osdep.c | 1 + util/oslib-posix.c | 2 + util/oslib-win32.c | 2 + util/path.c | 2 + util/qemu-option.c | 4 + util/qemu-sockets.c | 2 + util/readline.c | 1 + util/throttle.c | 1 + util/unicode.c | 2 +- vl.c | 6 +- 620 files changed, 1776 insertions(+), 756 deletions(-) create mode 100644 include/hw/nvram/fw_cfg_keys.h create mode 100644 include/qemu/bcd.h create mode 100644 include/qemu/cutils.h create mode 100644 include/qemu/help_option.h create mode 100644 include/qemu/id.h create mode 100644 include/qemu/path.h create mode 100644 include/qemu/unicode.h create mode 100644 tests/test-logging.c -- 2.5.0 diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 778af4a..e47e94f 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include <sys/ioctl.h> #include "exec/address-spaces.h" #include "hw/hw.h" diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 0be4135..3e0bdc1 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include <wchar.h> #include <dirent.h> diff --git a/net/tap-aix.c b/net/tap-aix.c index 9d830b7..0e6da63 100644 --- a/net/tap-aix.c +++ b/net/tap-aix.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "tap_int.h" int tap_open(char *ifname, int ifname_size, int *vnet_hdr, diff --git a/net/tap-bsd.c b/net/tap-bsd.c index ff47033..c506ac3 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "tap_int.h" #include "qemu/cutils.h" #include "sysemu/sysemu.h" diff --git a/net/tap-haiku.c b/net/tap-haiku.c index 397e532..b27e57e 100644 --- a/net/tap-haiku.c +++ b/net/tap-haiku.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "tap_int.h" int tap_open(char *ifname, int ifname_size, int *vnet_hdr, diff --git a/net/tap-solaris.c b/net/tap-solaris.c index aef59c1..a2a9235 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "tap_int.h" #include "sysemu/sysemu.h" #include "qemu/cutils.h"