Merge remote-tracking branch 'qemu/master'
commita7df12d45e8d2ad23e8cf39a963e86a9b4d5ed85
authorStefan Weil <sw@weilnetz.de>
Wed, 18 Sep 2019 12:22:46 +0000 (18 14:22 +0200)
committerStefan Weil <sw@weilnetz.de>
Fri, 31 Jan 2020 13:33:05 +0000 (31 14:33 +0100)
tree8c1096b9458a07fd0c3fb7907f2b1662d9b28104
parent013a2ecf4fe4161e43f3d0ddd92d7b7bb000fb8d
parentf8c3db33a5e863291182f8862ddf81618a7c6194
Merge remote-tracking branch 'qemu/master'

Conflicts:
 hw/dma/omap_dma.c
 hw/misc/Makefile.objs
 target/mips/cp0_timer.c
 target/mips/op_helper.c
 util/memfd.c

Signed-off-by: Stefan Weil <sw@weilnetz.de>
101 files changed:
Makefile
accel/tcg/cpu-exec.c
accel/tcg/user-exec.c
block.c
block/file-posix.c
block/rbd.c
block/vhdx.c
configure
contrib/libvhost-user/libvhost-user.c
docs/qemu-block-drivers.texi
exec.c
hw/arm/allwinner-a10.c
hw/arm/arm_tt.c
hw/arm/aspeed_soc.c
hw/arm/bast.c
hw/arm/boot.c
hw/arm/digic.c
hw/arm/fsl-imx25.c
hw/arm/fsl-imx31.c
hw/arm/musicpal.c
hw/arm/pxa2xx.c
hw/arm/pxa2xx_pic.c
hw/arm/s3c2410x.c
hw/arm/s3c2440.c
hw/arm/s3c24xx_clkcon.c
hw/arm/s3c24xx_gpio.c
hw/arm/s3c24xx_iic.c
hw/arm/s3c24xx_irq.c
hw/arm/s3c24xx_memc.c
hw/arm/s3c24xx_serial.c
hw/arm/s3c24xx_timers.c
hw/arm/xlnx-zynqmp.c
hw/char/serial.c
hw/display/pl110.c
hw/display/vga.c
hw/dma/etraxfs_dma.c
hw/input/ps2.c
hw/intc/sh_intc.c
hw/m68k/mcf5208.c
hw/mips/gt64xxx_pci.c
hw/mips/mips_r4k.c
hw/misc/Makefile.objs
hw/misc/bcm2835_mphi.c
hw/misc/bcm2835_power.c
hw/misc/macio/macio.c
hw/net/atheros_wlan.c
hw/net/eepro100.c
hw/net/imx_fec.c
hw/net/smc91c111.c
hw/nvram/eeprom93xx.c
hw/pci/pci.c
hw/ppc/ppc405_boards.c
hw/ppc/ppce500_spin.c
hw/ppc/prep.c
hw/scsi/megasas.c
hw/sh4/sh7750.c
hw/timer/bcm2835_st.c
hw/timer/bcm2835_timer.c
hw/timer/twl92230.c
hw/usb/bcm2835_usb.c
hw/xen/xen-bus.c
include/block/block_int.h
include/exec/cpu-all.h
include/exec/exec-all.h
include/exec/tb-hash.h
include/hw/arm/boot.h
include/hw/char/serial.h
include/hw/core/cpu.h
include/qapi/error.h
include/qom/object.h
linux-user/elfload.c
linux-user/qemu.h
linux-user/syscall.c
memory.c
net/tap-win32.c
os-win32.c
qemu-doc.texi
qemu-options.hx
qemu.nsi
qom/object.c
target/arm/cpu.c
target/arm/cpu.h
target/arm/op_helper.c
target/cris/translate.c
target/i386/cpu.h
target/i386/kvm.c
target/i386/whpx-all.c
target/m68k/translate.c
target/mips/cp0_timer.c
target/mips/cpu.h
target/mips/op_helper.c
tcg/i386/tcg-target.inc.c
tcg/tcg.c
tests/ahci-test.c
tests/ivshmem-test.c
tests/libqtest.c
tests/usb-hcd-uhci-test.c
ui/vnc.c
ui/vnc.h
util/oslib-win32.c
vl.c