projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: acdb0d7 1ee2dae)
Merge tag 'v1.6.0' into tizen_qemu_1.6
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 10 Sep 2013 03:18:05 +0000 (12:18 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 10 Sep 2013 03:18:05 +0000 (12:18 +0900)
commit74ba0a08e4265c04556102cda35743f0f09df318
tree1331a947c908a50877632c2d9b916c664267540btree | snapshot
parentacdb0d70ee52e7e811665784af6c7bb22d4d613fcommit | diff
parent1ee2daeb6448312d6d0e22175f5c1b9b01f8974ccommit | diff
Merge tag 'v1.6.0' into tizen_qemu_1.6

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
VERSION
arch_init.c
block/vmdk.c
configure
cpu-exec.c
cpus.c
exec.c
hw/9pfs/virtio-9p-device.c
hw/display/vga-pci.c
hw/pci-host/q35.c
hw/usb/dev-storage.c
hw/virtio/virtio-mmio.c
include/exec/cpu-defs.h
include/qemu/error-report.h
include/qemu/log.h
include/sysemu/kvm.h
include/sysemu/sysemu.h
pc-bios/bios.bin
qapi-schema.json
qemu-char.c
ui/input.c
util/oslib-win32.c
vl.c
46 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
block/raw-win32.c diff1 | diff2 | blob | history
block/vmdk.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
exec.c diff1 | diff2 | blob | history
hw/9pfs/virtio-9p-device.c diff1 | diff2 | blob | history
hw/display/vga-pci.c 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/input/pl050.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-hid.c diff1 | diff2 | blob | history
hw/usb/dev-storage.c diff1 | diff2 | blob | history
hw/virtio/virtio-pci.c diff1 | diff2 | blob | history
include/exec/cpu-defs.h diff1 | diff2 | blob | history
include/exec/hwaddr.h diff1 | diff2 | blob | history
include/hw/i386/pc.h diff1 | diff2 | blob | history
include/qemu-common.h diff1 | diff2 | blob | history
include/sysemu/kvm.h diff1 | diff2 | blob | history
include/sysemu/sysemu.h diff1 | diff2 | blob | history
include/ui/console.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/hax-all.c diff1 | | 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
ui/input.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;