Public Git Hosting - qemu/ar7.git/commit

commit	4a9719dc074849e5c3967382a2eec7252427d9f6
author	Stefan Weil <sw@weilnetz.de>
	Thu, 9 Mar 2017 07:08:11 +0000 (9 08:08 +0100)
committer	Stefan Weil <sw@weilnetz.de>
	Thu, 9 Mar 2017 07:08:11 +0000 (9 08:08 +0100)
tree	d0c757770352bb03d0688b5dc08a6edcc45de4e7	tree \| snapshot (tar.gz zip)
parent	0bd1f6b1b20a7a882663201b6e5351a01202331a	commit \| diff
parent	b64842dee42d6b24d51283e4722140b73be1e222	commit \| diff

Merge remote-tracking branch 'qemu/master'

# Conflicts:
# Makefile
# configure
# hw/display/vga.c
# include/hw/arm/bcm2835_peripherals.h
# include/qapi/qmp/qjson.h
# migration/savevm.c
# qemu-char.c
# target/i386/cpu.h
# target/i386/helper.h
# target/i386/svm_helper.c
# target/sparc/translate.c

Signed-off-by: Stefan Weil <sw@weilnetz.de>

71 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
block/vhdx.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
cpus.c	diff1 \|	diff2 \|	blob \| history
default-configs/arm-softmmu.mak	diff1 \|	diff2 \|	blob \| history
default-configs/mips-softmmu-common.mak	diff1 \|	diff2 \|	blob \| history
default-configs/pci.mak	diff1 \|	diff2 \|	blob \| history
disas/cris.c	diff1 \|	diff2 \|	blob \| history
docs/tracing.txt	diff1 \|	diff2 \|	blob \| history
exec.c	diff1 \|	diff2 \|	blob \| history
hw/arm/bcm2835_peripherals.c	diff1 \|	diff2 \|	blob \| history
hw/arm/exynos4210.c	diff1 \|	diff2 \|	blob \| history
hw/char/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/display/vga.c	diff1 \|	diff2 \|	blob \| history
hw/input/ps2.c	diff1 \|	diff2 \|	blob \| history
hw/m68k/mcf5208.c	diff1 \|	diff2 \|	blob \| history
hw/mips/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/mips/mips_malta.c	diff1 \|	diff2 \|	blob \| history
hw/mips/mips_r4k.c	diff1 \|	diff2 \|	blob \| history
hw/misc/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/pci/pci.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/ppce500_spin.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/prep.c	diff1 \|	diff2 \|	blob \| history
hw/scsi/megasas.c	diff1 \|	diff2 \|	blob \| history
hw/timer/Makefile.objs	diff1 \|	diff2 \|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
include/exec/exec-all.h	diff1 \|	diff2 \|	blob \| history
include/glib-compat.h	diff1 \|	diff2 \|	blob \| history
include/hw/arm/arm.h	diff1 \|	diff2 \|	blob \| history
include/hw/arm/bcm2835_peripherals.h	diff1 \|	diff2 \|	blob \| history
include/hw/pci/pci_ids.h	diff1 \|	diff2 \|	blob \| history
include/qemu-common.h	diff1 \|	diff2 \|	blob \| history
include/qom/cpu.h	diff1 \|	diff2 \|	blob \| history
linux-user/elfload.c	diff1 \|	diff2 \|	blob \| history
linux-user/main.c	diff1 \|	diff2 \|	blob \| history
linux-user/syscall.c	diff1 \|	diff2 \|	blob \| history
memory.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
pc-bios/README	diff1 \|	diff2 \|	blob \| history
qemu-io.c	diff1 \|	diff2 \|	blob \| history
qemu-options.hx	diff1 \|	diff2 \|	blob \| history
rules.mak	diff1 \|	diff2 \|	blob \| history
scripts/qapi2texi.py	diff1 \|	diff2 \|	blob \| history
stubs/Makefile.objs	diff1 \|	diff2 \|	blob \| history
target/arm/cpu.c	diff1 \|	diff2 \|	blob \| history
target/arm/cpu.h	diff1 \|	diff2 \|	blob \| history
target/arm/helper.c	diff1 \|	diff2 \|	blob \| history
target/arm/op_helper.c	diff1 \|	diff2 \|	blob \| history
target/arm/translate.c	diff1 \|	diff2 \|	blob \| history
target/i386/cpu.h	diff1 \|	diff2 \|	blob \| history
target/i386/helper.h	diff1 \|	diff2 \|	blob \| history
target/i386/kvm.c	diff1 \|	diff2 \|	blob \| history
target/i386/misc_helper.c	diff1 \|	diff2 \|	blob \| history
target/i386/seg_helper.c	diff1 \|	diff2 \|	blob \| history
target/i386/svm_helper.c	diff1 \|	diff2 \|	blob \| history
target/mips/cpu.h	diff1 \|	diff2 \|	blob \| history
target/ppc/excp_helper.c	diff1 \|	diff2 \|	blob \| history
target/ppc/translate_init.c	diff1 \|	diff2 \|	blob \| history
tcg/tcg.h	diff1 \|	diff2 \|	blob \| history
tests/ide-test.c	diff1 \|	diff2 \|	blob \| history
tests/libqtest.c	diff1 \|	diff2 \|	blob \| history
tests/qemu-iotests/common.rc	diff1 \|	diff2 \|	blob \| history
tests/test-qobject-input-visitor.c	diff1 \|	diff2 \|	blob \| history
translate-all.c	diff1 \|	diff2 \|	blob \| history
ui/console.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.h	diff1 \|	diff2 \|	blob \| history
util/cutils.c	diff1 \|	diff2 \|	blob \| history
util/qemu-option.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
block/vhdx.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
cpus.c	diff1 \|	diff2 \|	blob \| history
default-configs/arm-softmmu.mak	diff1 \|	diff2 \|	blob \| history
default-configs/mips-softmmu-common.mak	diff1 \|	diff2 \|	blob \| history
default-configs/pci.mak	diff1 \|	diff2 \|	blob \| history
disas/cris.c	diff1 \|	diff2 \|	blob \| history
docs/tracing.txt	diff1 \|	diff2 \|	blob \| history
exec.c	diff1 \|	diff2 \|	blob \| history
hw/arm/bcm2835_peripherals.c	diff1 \|	diff2 \|	blob \| history
hw/arm/exynos4210.c	diff1 \|	diff2 \|	blob \| history
hw/char/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/display/vga.c	diff1 \|	diff2 \|	blob \| history
hw/input/ps2.c	diff1 \|	diff2 \|	blob \| history
hw/m68k/mcf5208.c	diff1 \|	diff2 \|	blob \| history
hw/mips/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/mips/mips_malta.c	diff1 \|	diff2 \|	blob \| history
hw/mips/mips_r4k.c	diff1 \|	diff2 \|	blob \| history
hw/misc/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/pci/pci.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/ppce500_spin.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/prep.c	diff1 \|	diff2 \|	blob \| history
hw/scsi/megasas.c	diff1 \|	diff2 \|	blob \| history
hw/timer/Makefile.objs	diff1 \|	diff2 \|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
include/exec/exec-all.h	diff1 \|	diff2 \|	blob \| history
include/glib-compat.h	diff1 \|	diff2 \|	blob \| history
include/hw/arm/arm.h	diff1 \|	diff2 \|	blob \| history
include/hw/arm/bcm2835_peripherals.h	diff1 \|	diff2 \|	blob \| history
include/hw/pci/pci_ids.h	diff1 \|	diff2 \|	blob \| history
include/qemu-common.h	diff1 \|	diff2 \|	blob \| history
include/qom/cpu.h	diff1 \|	diff2 \|	blob \| history
linux-user/elfload.c	diff1 \|	diff2 \|	blob \| history
linux-user/main.c	diff1 \|	diff2 \|	blob \| history
linux-user/syscall.c	diff1 \|	diff2 \|	blob \| history
memory.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
pc-bios/README	diff1 \|	diff2 \|	blob \| history
qemu-io.c	diff1 \|	diff2 \|	blob \| history
qemu-options.hx	diff1 \|	diff2 \|	blob \| history
rules.mak	diff1 \|	diff2 \|	blob \| history
scripts/qapi2texi.py	diff1 \|	diff2 \|	blob \| history
stubs/Makefile.objs	diff1 \|	diff2 \|	blob \| history
target/arm/cpu.c	diff1 \|	diff2 \|	blob \| history
target/arm/cpu.h	diff1 \|	diff2 \|	blob \| history
target/arm/helper.c	diff1 \|	diff2 \|	blob \| history
target/arm/op_helper.c	diff1 \|	diff2 \|	blob \| history
target/arm/translate.c	diff1 \|	diff2 \|	blob \| history
target/i386/cpu.h	diff1 \|	diff2 \|	blob \| history
target/i386/helper.h	diff1 \|	diff2 \|	blob \| history
target/i386/kvm.c	diff1 \|	diff2 \|	blob \| history
target/i386/misc_helper.c	diff1 \|	diff2 \|	blob \| history
target/i386/seg_helper.c	diff1 \|	diff2 \|	blob \| history
target/i386/svm_helper.c	diff1 \|	diff2 \|	blob \| history
target/mips/cpu.h	diff1 \|	diff2 \|	blob \| history
target/ppc/excp_helper.c	diff1 \|	diff2 \|	blob \| history
target/ppc/translate_init.c	diff1 \|	diff2 \|	blob \| history
tcg/tcg.h	diff1 \|	diff2 \|	blob \| history
tests/ide-test.c	diff1 \|	diff2 \|	blob \| history
tests/libqtest.c	diff1 \|	diff2 \|	blob \| history
tests/qemu-iotests/common.rc	diff1 \|	diff2 \|	blob \| history
tests/test-qobject-input-visitor.c	diff1 \|	diff2 \|	blob \| history
translate-all.c	diff1 \|	diff2 \|	blob \| history
ui/console.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.h	diff1 \|	diff2 \|	blob \| history
util/cutils.c	diff1 \|	diff2 \|	blob \| history
util/qemu-option.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history