?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 4acdf67 9e39031)
Merge remote-tracking branch 'qemu/master'
commitd3f06afcc692a07acb8e2c1fc7b8184cfd007096
authorStefan Weil <sw@weilnetz.de>
Sat, 13 Jun 2020 07:25:37 +0000 (13 09:25 +0200)
committerStefan Weil <sw@weilnetz.de>
Sat, 13 Jun 2020 07:25:37 +0000 (13 09:25 +0200)
tree63e1c2387f4dba1c73005a9477788d14c191691ftree | snapshot (tar.gz zip)
parent4acdf677e56f53866af74d167dd6502385573e89commit | diff
parent9e3903136d9acde2fb2dd9e967ba928050a6cb4acommit | diff
Merge remote-tracking branch 'qemu/master'

Conflicts:
accel/tcg/user-exec.c
bsd-user/main.c
contrib/libvhost-user/libvhost-user.c
hw/mips/Makefile.objs
hw/misc/Makefile.objs
hw/misc/bcm2835_mphi.c
include/exec/cpu-all.h
include/hw/misc/bcm2835_mphi.h
target/arm/cpu.c

Signed-off-by: Stefan Weil <sw@weilnetz.de>
58 files changed:
Makefile diff1 |  diff2 |  blob | history
accel/tcg/translate-all.c diff1 |  diff2 |  blob | history
accel/tcg/user-exec.c diff1 |  diff2 |  blob | history
block.c diff1 |  diff2 |  blob | history
block/file-posix.c diff1 |  diff2 |  blob | history
block/rbd.c diff1 |  diff2 |  blob | history
block/vhdx.c diff1 |  diff2 |  blob | history
bsd-user/main.c diff1 |  diff2 |  blob | history
configure diff1 |  diff2 |  blob | history
contrib/libvhost-user/libvhost-user.c diff1 |  diff2 |  blob | history
disas.c diff1 |  diff2 |  blob | history
exec.c diff1 |  diff2 |  blob | history
hw/arm/allwinner-a10.c diff1 |  diff2 |  blob | history
hw/arm/aspeed_soc.c diff1 |  diff2 |  blob | history
hw/arm/bcm2835_peripherals.c diff1 |  diff2 |  blob | history
hw/arm/fsl-imx25.c diff1 |  diff2 |  blob | history
hw/arm/fsl-imx31.c diff1 |  diff2 |  blob | history
hw/arm/fsl-imx7.c diff1 |  diff2 |  blob | history
hw/arm/musicpal.c diff1 |  diff2 |  blob | history
hw/arm/pxa2xx.c diff1 |  diff2 |  blob | history
hw/arm/xlnx-zynqmp.c diff1 |  diff2 |  blob | history
hw/block/Makefile.objs diff1 |  diff2 |  blob | history
hw/char/serial.c diff1 |  diff2 |  blob | history
hw/m68k/mcf5208.c diff1 |  diff2 |  blob | history
hw/mips/Kconfig diff1 |  diff2 |  blob | history
hw/mips/Makefile.objs diff1 |  diff2 |  blob | history
hw/mips/r4k.c diff1 |  diff2 |  blob | history
hw/misc/Makefile.objs diff1 |  diff2 |  blob | history
hw/misc/macio/macio.c diff1 |  diff2 |  blob | history
hw/net/eepro100.c diff1 |  diff2 |  blob | history
hw/pci/pci.c diff1 |  diff2 |  blob | history
hw/xen/xen-bus.c diff1 |  diff2 |  blob | history
include/block/block_int.h diff1 |  diff2 |  blob | history
include/exec/cpu-all.h diff1 |  diff2 |  blob | history
include/exec/exec-all.h diff1 |  diff2 |  blob | history
include/hw/arm/bcm2835_peripherals.h diff1 |  diff2 |  blob | history
include/hw/core/cpu.h diff1 |  diff2 |  blob | history
include/hw/xen/xen-bus.h diff1 |  diff2 |  blob | history
include/qom/object.h diff1 |  diff2 |  blob | history
linux-user/elfload.c diff1 |  diff2 |  blob | history
linux-user/qemu.h diff1 |  diff2 |  blob | history
linux-user/syscall.c diff1 |  diff2 |  blob | history
memory.c diff1 |  diff2 |  blob | history
qemu-options.hx diff1 |  diff2 |  blob | history
qom/object.c diff1 |  diff2 |  blob | history
softmmu/vl.c diff1 |  diff2 |  blob | history
target/arm/cpu.h diff1 |  diff2 |  blob | history
target/i386/kvm.c diff1 |  diff2 |  blob | history
target/m68k/translate.c diff1 |  diff2 |  blob | history
target/microblaze/op_helper.c diff1 |  diff2 |  blob | history
target/microblaze/translate.c diff1 |  diff2 |  blob | history
target/mips/cpu.h diff1 |  diff2 |  blob | history
target/ppc/excp_helper.c diff1 |  diff2 |  blob | history
tcg/i386/tcg-target.inc.c diff1 |  diff2 |  blob | history
tcg/tcg.c diff1 |  diff2 |  blob | history
tools/virtiofsd/passthrough_ll.c diff1 |  diff2 |  blob | history
ui/console.c diff1 |  diff2 |  blob | history
ui/vnc.c diff1 |  diff2 |  blob | history
AR7 emulation for QEMU