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

1 files changed, 8 insertions, 6 deletions

diff --git a/ui/input.c b/ui/input.c
index 032e51c7bf..0254d7e364 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -28,6 +28,8 @@
 #include "qapi/error.h"
 #include "qmp-commands.h"
 #include "qapi-types.h"
+#include "ui/keymaps.h"
+
 //#include "tizen/src/debug_ch.h"
 
 //MULTI_DEBUG_CHANNEL(tizen, input);
@@ -263,10 +265,10 @@ static void free_keycodes(void)
 static void release_keys(void *opaque)
 {
     while (keycodes_size > 0) {
-        if (keycodes[--keycodes_size] & 0x80) {
-            kbd_put_keycode(0xe0);
+        if (keycodes[--keycodes_size] & SCANCODE_GREY) {
+            kbd_put_keycode(SCANCODE_EMUL0);
         }
-        kbd_put_keycode(keycodes[keycodes_size] | 0x80);
+        kbd_put_keycode(keycodes[keycodes_size] | SCANCODE_UP);
     }
 
     free_keycodes();
@@ -300,10 +302,10 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time,
             return;
         }
 
-        if (keycode & 0x80) {
-            kbd_put_keycode(0xe0);
+        if (keycode & SCANCODE_GREY) {
+            kbd_put_keycode(SCANCODE_EMUL0);
         }
-        kbd_put_keycode(keycode & 0x7f);
+        kbd_put_keycode(keycode & SCANCODE_KEYCODEMASK);
 
         keycodes = g_realloc(keycodes, sizeof(int) * (keycodes_size + 1));
         keycodes[keycodes_size++] = keycode;