Merge remote-tracking branch 'qemu/master'
commitb7fd85afd4040e57e5b9df3c56a2f044affb44b4
authorStefan Weil <sw@weilnetz.de>
Wed, 30 Mar 2016 20:29:25 +0000 (30 22:29 +0200)
committerStefan Weil <sw@weilnetz.de>
Wed, 30 Mar 2016 20:29:25 +0000 (30 22:29 +0200)
tree9d17c9c0dad070d2e0e2eed5b300a667dc77eb57
parent6c0bf8b4d71996f8fd99e2491d363903750570bd
parent489ef4c810033e63af570c8a430af8b9858bfa5f
Merge remote-tracking branch 'qemu/master'

Conflicts:
exec.c
hw/arm/raspi.c
hw/char/serial.c
hw/mips/mips_malta.c
include/qemu-common.h
slirp/if.c

+ API updates.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
72 files changed:
block/Makefile.objs
block/raw-win32.c
block/vhdx.c
bsd-user/main.c
configure
cpus.c
default-configs/mips-softmmu-common.mak
exec.c
hw/arm/armv7m.c
hw/arm/bcm2835.c
hw/arm/bcm2835_peripherals.c
hw/arm/boot.c
hw/arm/exynos4210.c
hw/arm/musicpal.c
hw/arm/pxa2xx_pic.c
hw/arm/raspi.c
hw/arm/s3c2410x.c
hw/arm/s3c2440.c
hw/arm/s3c24xx_rtc.c
hw/arm/s3c24xx_timers.c
hw/block/pflash_amd.c
hw/char/serial.c
hw/display/vga.c
hw/intc/sh_intc.c
hw/m68k/mcf5208.c
hw/mips/Makefile.objs
hw/mips/ar7.c
hw/mips/mips_malta.c
hw/mips/mips_r4k.c
hw/misc/Makefile.objs
hw/pci/pci.c
hw/ppc/ppc405_boards.c
hw/ppc/prep.c
hw/usb/bcm2835_usb.c
hw/usb/host-libusb.c
include/block/block_int.h
include/exec/exec-all.h
include/qapi/error.h
include/qemu-common.h
include/qom/cpu.h
include/qom/object.h
linux-user/elfload.c
linux-user/main.c
linux-user/syscall.c
memory.c
migration/savevm.c
monitor.c
qemu-char.c
qemu-io.c
qemu-options.hx
qobject/json-parser.c
qom/object.c
target-arm/cpu.c
target-arm/translate.c
target-i386/cpu.h
target-i386/helper.h
target-i386/kvm.c
target-i386/misc_helper.c
target-i386/translate.c
target-mips/cpu.h
target-mips/op_helper.c
tcg/tcg.c
tcg/tcg.h
tests/test-qmp-input-visitor.c
translate-all.c
ui/vnc.c
util/cutils.c
util/error.c
util/oslib-win32.c
util/qemu-option.c
util/readline.c
vl.c