Merge remote-tracking branch 'qemu/master'
commit70186fc064d59d71a706e11170eb62e6eabf91da
authorStefan Weil <sw@weilnetz.de>
Sat, 15 Oct 2016 13:36:09 +0000 (15 15:36 +0200)
committerStefan Weil <sw@weilnetz.de>
Sat, 15 Oct 2016 13:36:09 +0000 (15 15:36 +0200)
tree09851ba6a57d43e5b02e1b2a349b0eece94e9807
parent672d54588f7c88cf878791a4c86f2bea69547aa2
parent6aa5a3679449cdf0b6fe5a6829b22e642ded57fd
Merge remote-tracking branch 'qemu/master'

# Conflicts:
# Makefile
# Makefile.target
# qemu-doc.texi
# target-ppc/excp_helper.c

+ API updates.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
72 files changed:
MAINTAINERS
Makefile
Makefile.target
block/Makefile.objs
block/vhdx.c
bsd-user/main.c
configure
cpus.c
default-configs/arm-softmmu.mak
docs/tracing.txt
exec.c
hw/arm/Makefile.objs
hw/arm/musicpal.c
hw/arm/syborg_timer.c
hw/input/ps2.c
hw/m68k/mcf5208.c
hw/misc/Makefile.objs
hw/ppc/ppce500_spin.c
hw/scsi/megasas.c
hw/timer/bcm2835_timer.c
include/block/block_int.h
include/exec/exec-all.h
include/glib-compat.h
include/qom/cpu.h
linux-user/elfload.c
linux-user/main.c
linux-user/qemu.h
linux-user/sh4/target_syscall.h
linux-user/syscall.c
memory.c
monitor.c
po/Makefile
qemu-char.c
qemu-doc.texi
qemu-io.c
qemu-options.hx
qemu-tech.texi
qemu.nsi
qga/vss-win32/Makefile.objs
qom/object.c
rules.mak
target-arm/cpu.c
target-arm/helper.c
target-arm/op_helper.c
target-arm/translate.c
target-cris/cpu.h
target-cris/translate.c
target-i386/cpu.h
target-i386/kvm.c
target-i386/seg_helper.c
target-i386/translate.c
target-mips/op_helper.c
target-ppc/excp_helper.c
target-ppc/translate_init.c
tcg/i386/tcg-target.inc.c
tcg/tcg.c
tcg/tcg.h
tests/ide-test.c
tests/libqos/libqos-pc.c
tests/libqos/libqos.c
tests/libqos/libqos.h
tests/libqtest.c
tests/qemu-iotests/common.rc
translate-all.c
ui/console.c
ui/vnc.c
ui/vnc.h
user-exec.c
util/coroutine-win32.c
util/cutils.c
util/oslib-win32.c
vl.c