From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qq7DK-0003M3-3Q for qemu-devel@nongnu.org; Sun, 07 Aug 2011 13:32:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qq7DH-0000eu-NR for qemu-devel@nongnu.org; Sun, 07 Aug 2011 13:32:38 -0400 Received: from mail.serverraum.org ([78.47.150.89]:49451) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qq7DH-0000dm-IM for qemu-devel@nongnu.org; Sun, 07 Aug 2011 13:32:35 -0400 From: Michael Walle Date: Sun, 7 Aug 2011 19:29:17 +0200 Message-Id: <1312738160-28961-2-git-send-email-michael@walle.cc> In-Reply-To: <1312738160-28961-1-git-send-email-michael@walle.cc> References: <1312738160-28961-1-git-send-email-michael@walle.cc> Subject: [Qemu-devel] [PATCH 1/4] 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 Register the keyboard event handler in hid's init() instead of its reset() function. Signed-off-by: Michael Walle --- hw/hid.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/hid.c b/hw/hid.c index 7b5ef5f..6934f05 100644 --- a/hw/hid.c +++ b/hw/hid.c @@ -359,7 +359,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; @@ -393,7 +392,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.2.5