review.tizen.org Git - sdk/emulator/qemu.git/commit

projects / sdk / emulator / qemu.git / commit

author	SeokYeon Hwang <syeon.hwang@samsung.com>
	Mon, 21 Apr 2014 06:32:27 +0000 (15:32 +0900)
committer	SeokYeon Hwang <syeon.hwang@samsung.com>
	Mon, 21 Apr 2014 06:57:17 +0000 (15:57 +0900)
commit	c38a355e67e966e447e3b58b897daffda70e2801
tree	3a90ebbaf8bf89014212325e374e5073f074b014	tree \| snapshot
parent	3d8e749baf4b053639581bc11e5664dc182e621d	commit \| diff
parent	a9e8aeb3755bccb7b51174adcf4a3fc427e0d147	commit \| diff

Merge branch 'upstream_qemu_2.0' into tizen

Initial merge

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
.gitignore
Makefile.target
block/raw-win32.c
configure
cpu-exec.c
cpus.c
hw/9pfs/virtio-9p-device.c
hw/i386/pc_piix.c
include/exec/cpu-defs.h
include/qemu-common.h
include/sysemu/sysemu.h
include/ui/console.h
tcg/i386/tcg-target.c
tcg/tcg.h
ui/console.c
ui/input.c
util/oslib-posix.c
vl.c

Change-Id: I52df9052942eea8d541bde75fd936e58a9f2f8ff

52 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/9pfs/virtio-9p-device.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-pci.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-hid.c	diff1 \|	diff2 \|	blob \| history
hw/usb/dev-storage.c	diff1 \|	diff2 \|	blob \| history
hw/virtio/virtio-pci.c	diff1 \|	diff2 \|	blob \| history
hw/virtio/virtio-pci.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
net/tap-win32.c	diff1 \|	diff2 \|	blob \| history
os-win32.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/tcg.c	diff1 \|	diff2 \|	blob \| history
ui/console.c	diff1 \|	diff2 \|	blob \| history
ui/input.c	diff1 \|	diff2 \|	blob \| history
ui/sdl.c	diff1 \|	diff2 \|	blob \| history
ui/spice-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
util/qemu-thread-posix.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history
xen-all.c	diff1 \|	diff2 \|	blob \| history

Domain: SDK / Emulator;

RSS Atom

.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/9pfs/virtio-9p-device.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-pci.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-hid.c	diff1 \|	diff2 \|	blob \| history
hw/usb/dev-storage.c	diff1 \|	diff2 \|	blob \| history
hw/virtio/virtio-pci.c	diff1 \|	diff2 \|	blob \| history
hw/virtio/virtio-pci.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
net/tap-win32.c	diff1 \|	diff2 \|	blob \| history
os-win32.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/tcg.c	diff1 \|	diff2 \|	blob \| history
ui/console.c	diff1 \|	diff2 \|	blob \| history
ui/input.c	diff1 \|	diff2 \|	blob \| history
ui/sdl.c	diff1 \|	diff2 \|	blob \| history
ui/spice-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
util/qemu-thread-posix.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history
xen-all.c	diff1 \|	diff2 \|	blob \| history