From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrQ4Y-0007AO-FR for qemu-devel@nongnu.org; Thu, 11 Aug 2011 03:52:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrQ4X-00089m-Hm for qemu-devel@nongnu.org; Thu, 11 Aug 2011 03:52:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrQ4X-00089c-97 for qemu-devel@nongnu.org; Thu, 11 Aug 2011 03:52:57 -0400 From: Gerd Hoffmann Date: Thu, 11 Aug 2011 09:03:41 +0200 Message-Id: <1313046225-1064-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1313046225-1064-1-git-send-email-kraxel@redhat.com> References: <1313046225-1064-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] hid: register kbd hander in init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Michael Walle , Gerd Hoffmann From: Michael Walle Register the keyboard event handler in hid's init() instead of its reset() function. Signed-off-by: Michael Walle Signed-off-by: Gerd Hoffmann --- hw/hid.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/hid.c b/hw/hid.c index 77339f7..3dc4246 100644 --- a/hw/hid.c +++ b/hw/hid.c @@ -364,7 +364,6 @@ void hid_reset(HIDState *hs) { switch (hs->kind) { case HID_KEYBOARD: - qemu_add_kbd_event_handler(hid_keyboard_event, hs); memset(hs->kbd.keycodes, 0, sizeof(hs->kbd.keycodes)); memset(hs->kbd.key, 0, sizeof(hs->kbd.key)); hs->kbd.keys = 0; @@ -398,7 +397,9 @@ void hid_init(HIDState *hs, int kind, HIDEventFunc event) hs->kind = kind; hs->event = event; - if (hs->kind == HID_MOUSE) { + if (hs->kind == HID_KEYBOARD) { + qemu_add_kbd_event_handler(hid_keyboard_event, hs); + } else if (hs->kind == HID_MOUSE) { hs->ptr.eh_entry = qemu_add_mouse_event_handler(hid_pointer_event, hs, 0, "QEMU HID Mouse"); } else if (hs->kind == HID_TABLET) { -- 1.7.1