From c339a3409a3ffb5985021749b9a7518864f7cee9 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 23 Jun 2011 12:41:20 -0300 Subject: [RHEL6 qemu-kvm PATCH 047/115] usb keyboard: add event event queue RH-Author: Gerd Hoffmann Message-id: <1308832951-8995-45-git-send-email-kraxel@redhat.com> Patchwork-id: 27895 O-Subject: [RHEL-6.2 kvm PATCH 044/115] usb keyboard: add event event queue Bugzilla: 561414 632299 645351 711354 RH-Acked-by: Hans de Goede RH-Acked-by: Paolo Bonzini RH-Acked-by: Jes Sorensen This patch adds a event queue to the usb keyboard. This makes sure the guest will see all key events even if they come in bursts. With this patch applied sending Ctrl-Alt-Del using vncviewer's F8 menu works. Also with autosuspend enabled the first keypress on a suspended keyboard takes a little longer to be delivered to the guest because the usb bus must be resumed first. Without event queue this easily gets lost. Signed-off-by: Gerd Hoffmann (cherry picked from commit 5fae51a9c26c025b94f8d7c40f54b65049de7227) --- hw/usb-hid.c | 38 ++++++++++++++++++++++++++++++++------ 1 files changed, 32 insertions(+), 6 deletions(-) Signed-off-by: Eduardo Habkost --- hw/usb-hid.c | 38 ++++++++++++++++++++++++++++++++------ 1 files changed, 32 insertions(+), 6 deletions(-) diff --git a/hw/usb-hid.c b/hw/usb-hid.c index f0bcb7d..854a88d 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -63,6 +63,9 @@ typedef struct USBMouseState { } USBMouseState; typedef struct USBKeyboardState { + uint32_t keycodes[QUEUE_LENGTH]; + uint32_t head; /* index into circular queue */ + uint32_t n; uint16_t modifiers; uint8_t leds; uint8_t key[16]; @@ -494,8 +497,27 @@ static void usb_keyboard_event(void *opaque, int keycode) { USBHIDState *hs = opaque; USBKeyboardState *s = &hs->kbd; + int slot; + + if (s->n == QUEUE_LENGTH) { + fprintf(stderr, "usb-kbd: warning: key event queue full\n"); + return; + } + slot = (s->head + s->n) & QUEUE_MASK; s->n++; + s->keycodes[slot] = keycode; + usb_hid_changed(hs); +} + +static void usb_keyboard_process_keycode(USBKeyboardState *s) +{ uint8_t hid_code, key; - int i; + int i, keycode, slot; + + if (s->n == 0) { + return; + } + slot = s->head & QUEUE_MASK; QUEUE_INCR(s->head); s->n--; + keycode = s->keycodes[slot]; key = keycode & 0x7f; hid_code = usb_hid_usage_keys[key | ((s->modifiers >> 1) & (1 << 7))]; @@ -528,7 +550,6 @@ static void usb_keyboard_event(void *opaque, int keycode) if (s->key[i] == hid_code) { s->key[i] = s->key[-- s->keys]; s->key[s->keys] = 0x00; - usb_hid_changed(hs); break; } if (i < 0) @@ -543,8 +564,6 @@ static void usb_keyboard_event(void *opaque, int keycode) } else return; } - - usb_hid_changed(hs); } static inline int int_clamp(int val, int vmin, int vmax) @@ -645,6 +664,8 @@ static int usb_keyboard_poll(USBHIDState *hs, uint8_t *buf, int len) if (len < 2) return 0; + usb_keyboard_process_keycode(s); + buf[0] = s->modifiers & 0xff; buf[1] = 0; if (s->keys > 6) @@ -680,7 +701,7 @@ static void usb_mouse_handle_reset(USBDevice *dev) { USBHIDState *s = (USBHIDState *)dev; - memset (s->ptr.queue, 0, sizeof (s->ptr.queue)); + memset(s->ptr.queue, 0, sizeof (s->ptr.queue)); s->ptr.head = 0; s->ptr.n = 0; s->protocol = 1; @@ -691,6 +712,11 @@ static void usb_keyboard_handle_reset(USBDevice *dev) USBHIDState *s = (USBHIDState *)dev; qemu_add_kbd_event_handler(usb_keyboard_event, s); + memset(s->kbd.keycodes, 0, sizeof (s->kbd.keycodes)); + s->kbd.head = 0; + s->kbd.n = 0; + memset(s->kbd.key, 0, sizeof (s->kbd.key)); + s->kbd.keys = 0; s->protocol = 1; } @@ -800,7 +826,7 @@ static int usb_hid_handle_data(USBDevice *dev, USBPacket *p) } else if (s->kind == USB_KEYBOARD) { ret = usb_keyboard_poll(s, p->data, p->len); - s->changed = 0; + s->changed = s->kbd.n > 0; } } else { goto fail; -- 1.7.3.2