From: SeokYeon Hwang Date: Sun, 10 Jul 2016 11:01:20 +0000 (+0900) Subject: input: remove deadlock occured by missing mutex unlock X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~34^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb553a888fb4b01e74faf9b3c5518f9fdf31332c;p=sdk%2Femulator%2Fqemu.git input: remove deadlock occured by missing mutex unlock Change-Id: I06a2ac4437085e959be84f1c465a067a8a457ec2 Signed-off-by: SeokYeon Hwang --- diff --git a/tizen/src/hw/virtio/maru_virtio_input.c b/tizen/src/hw/virtio/maru_virtio_input.c index d84c5cf7bb..262ded4bbb 100644 --- a/tizen/src/hw/virtio/maru_virtio_input.c +++ b/tizen/src/hw/virtio/maru_virtio_input.c @@ -98,7 +98,7 @@ static void send_event(void *opaque) input->event_size); virtqueue_push(input->vq, element, len); } else { - LOG_SEVERE("virtqueue is not available, dropping event.\n"); + LOG_WARNING("virtqueue is not available, dropping event.\n"); break; } } @@ -222,12 +222,12 @@ void virtio_touchscreen_event(int x, int y, int z, int buttons_state) VirtIOMaruInput *input = &ts->input; touch_event *event; - qemu_mutex_lock(&input->event_mutex); - if (!check_ready(input)) { return; } + qemu_mutex_lock(&input->event_mutex); + event = &touch_events[input->buf_index++]; /* mouse event is copied into the queue */ @@ -326,12 +326,12 @@ void virtio_keyboard_event(int keycode) VirtIOMaruInput *input = &kbd->input; keyboard_event *event; - qemu_mutex_lock(&input->event_mutex); - if (!check_ready(input)) { return; } + qemu_mutex_lock(&input->event_mutex); + event = &keyboard_events[input->buf_index++]; if (keycode < 0xe0) {