projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 34668d8 0e7b9f0)
Merge branch 'upstream-1.7' into tizen_qemu_1.7
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 11 Dec 2013 01:38:35 +0000 (10:38 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 11 Dec 2013 05:12:09 +0000 (14:12 +0900)
commit1a81500c243dfe21a1c348d24b116b6315c66c83
tree8164064245de0479a0b5ae5b026719e81420de49tree | snapshot
parent34668d898e6581ddc47865e6de2d30b55ef47031commit | diff
parent0e7b9f06a6cc032be6ca2ac55a27592abd374179commit | diff
Merge branch 'upstream-1.7' into tizen_qemu_1.7

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
VERSION
block/cow.c
block/raw-win32.c
block/stream.c
block/vmdk.c
blockdev.c
exec.c
hw/i386/pc_piix.c
hw/scsi/scsi-bus.c
include/qom/cpu.h
include/sysemu/kvm.h
qemu-img.c
tcg/tcg.c
tcg/tcg.h
vl.c

Change-Id: Ib8de93ad2c05150934e17e63d7f8e90ffdfccc62
57 files changed:
.gitignore diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
Makefile.target diff1 | diff2 | blob | history
arch_init.c diff1 | diff2 | blob | history
audio/audio.c diff1 | diff2 | blob | history
block.c diff1 | diff2 | blob | history
block/raw-win32.c diff1 | diff2 | blob | history
blockdev.c diff1 | diff2 | blob | history
configure diff1 | diff2 | blob | history
cpu-exec.c diff1 | diff2 | blob | history
cpus.c diff1 | diff2 | blob | history
default-configs/arm-softmmu.mak diff1 | diff2 | blob | history
exec.c diff1 | diff2 | blob | history
hw/Makefile.objs diff1 | diff2 | blob | history
hw/acpi/piix4.c diff1 | diff2 | blob | history
hw/arm/Makefile.objs diff1 | diff2 | blob | history
hw/display/vga.c diff1 | diff2 | blob | history
hw/i386/pc.c diff1 | diff2 | blob | history
hw/i386/pc_piix.c diff1 | diff2 | blob | history
hw/i386/pc_sysfw.c diff1 | diff2 | blob | history
hw/intc/apic_common.c diff1 | diff2 | blob | history
hw/pci/pci-hotplug-old.c diff1 | diff2 | blob | history
hw/pci/pci.c diff1 | diff2 | blob | history
hw/usb/dev-storage.c diff1 | diff2 | blob | history
hw/vigs/vigs_device.c diff1 | | blob | history
hw/virtio/virtio-pci.c diff1 | diff2 | blob | history
include/exec/cpu-defs.h diff1 | diff2 | blob | history
include/hw/i386/pc.h diff1 | diff2 | blob | history
include/qemu-common.h diff1 | diff2 | blob | history
include/sysemu/arch_init.h diff1 | diff2 | blob | history
include/sysemu/kvm.h diff1 | diff2 | blob | history
include/sysemu/sysemu.h diff1 | diff2 | blob | history
main-loop.c diff1 | diff2 | blob | history
qapi-schema.json diff1 | diff2 | blob | history
qemu-char.c diff1 | diff2 | blob | history
qemu-options.hx diff1 | diff2 | blob | history
qom/object.c diff1 | diff2 | blob | history
target-i386/translate.c diff1 | diff2 | blob | history
tcg/i386/tcg-target.c diff1 | diff2 | blob | history
tcg/tcg.c diff1 | diff2 | blob | history
tcg/tcg.h diff1 | diff2 | blob | history
tizen/src/ecs/ecs.c diff1 | | blob | history
tizen/src/hw/maru_board.c diff1 | | blob | history
tizen/src/hw/maru_brill_codec.c diff1 | | blob | history
tizen/src/hw/maru_brill_codec.h diff1 | | blob | history
tizen/src/hw/maru_camera_common_pci.c diff1 | | blob | history
tizen/src/hw/maru_vga.c diff1 | | blob | history
tizen/src/hw/maru_vga_template.h diff1 | | blob | history
tizen/src/maru_sdl.c diff1 | | blob | history
tizen/src/mloop_event.c diff1 | | blob | history
ui/input.c diff1 | diff2 | blob | history
ui/sdl.c diff1 | diff2 | blob | history
util/oslib-posix.c diff1 | diff2 | blob | history
util/oslib-win32.c diff1 | diff2 | blob | history
util/qemu-sockets.c diff1 | diff2 | blob | history
vl.c diff1 | diff2 | blob | history
xen-all.c diff1 | diff2 | blob | history
Domain: SDK / Emulator;