From patchwork Wed Mar 31 20:55:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahar Havivi X-Patchwork-Id: 49178 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 120B6B7CF4 for ; Thu, 1 Apr 2010 08:03:11 +1100 (EST) Received: from localhost ([127.0.0.1]:49971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nx4zZ-0008VE-F4 for incoming@patchwork.ozlabs.org; Wed, 31 Mar 2010 16:58:25 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nx4yE-0008Qo-Cb for qemu-devel@nongnu.org; Wed, 31 Mar 2010 16:57:02 -0400 Received: from [140.186.70.92] (port=43741 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nx4yC-0008ND-Mx for qemu-devel@nongnu.org; Wed, 31 Mar 2010 16:57:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nx4yA-0004eX-F1 for qemu-devel@nongnu.org; Wed, 31 Mar 2010 16:57:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59454) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nx4yA-0004eQ-01 for qemu-devel@nongnu.org; Wed, 31 Mar 2010 16:56:58 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2VKusXp008272 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 31 Mar 2010 16:56:55 -0400 Received: from localhost (dhcp-1-229.tlv.redhat.com [10.35.1.229]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2VKurk9029566; Wed, 31 Mar 2010 16:56:54 -0400 Date: Wed, 31 Mar 2010 23:55:44 +0300 From: Shahar Havivi To: Anthony Liguori Subject: Re: [Qemu-devel] Re: [PATCH 2/2] Added monitor commands: 'keyboard_set' and 'info keybaord' Message-ID: <20100331205543.GB18849@redhat.com> References: <689f24e27d483de0e3201a9386c772dc241d4178.1270022701.git.shaharh@redhat.com> <4BB380BB.8000600@codemonkey.ws> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4BB380BB.8000600@codemonkey.ws> User-Agent: Mutt/1.5.20 (2009-08-17) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org, Juan Quintela X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org > >>+ > >>+ if (QTAILQ_EMPTY(&kbd_handlers)) { > >>+ qerror_report(QERR_DEVICE_NOT_FOUND, "keyboard"); > >>+ return -1; > >>+ } > >>+ > >>+ QTAILQ_FOREACH(cursor,&kbd_handlers, node) { > >>+ if (cursor->index == index) { > >>+ QTAILQ_REMOVE(&kbd_handlers, cursor, node); > >>+ QTAILQ_INSERT_HEAD(&kbd_handlers, cursor, node); > >>+ found = 1; > >well it is set :) > > Please split out this bit into a qemu_activate_keyboard_handler() > and plumb it with the usb device such that it's only used when a > guest loads a driver for it. > > It should be very symmetric to how the mouse driver works. > > Regards, > > Anthony Liguori Anthony, Added qemu_activate_keyboard_event_handler, and use it with usb_keyboard_poll. I test it with two usb keyboard devices, the last connected one is active. Shahar. Signed-off-by: Shahar Havivi --- console.h | 5 ++ hw/usb-hid.c | 6 +++ input.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ monitor.c | 8 ++++ qemu-monitor.hx | 17 ++++++++ 5 files changed, 147 insertions(+), 0 deletions(-) diff --git a/console.h b/console.h index 91b66ea..5d68cff 100644 --- a/console.h +++ b/console.h @@ -54,6 +54,7 @@ QEMUPutKbdEntry *qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque, const char *name); void qemu_remove_kbd_event_handler(QEMUPutKbdEntry *entry); +void qemu_activate_keyboard_event_handler(QEMUPutKbdEntry *entry); QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func, void *opaque, int absolute, const char *name); @@ -87,6 +88,10 @@ void do_info_mice_print(Monitor *mon, const QObject *data); void do_info_mice(Monitor *mon, QObject **ret_data); void do_mouse_set(Monitor *mon, const QDict *qdict); +void do_info_keyboard_print(Monitor *mon, const QObject *data); +void do_info_keyboard(Monitor *mon, QObject **ret_data); +int do_keyboard_set(Monitor *mon, const QDict *qdict, QObject **ret_data); + /* keysym is a unicode code except for special keys (see QEMU_KEY_xxx constants) */ #define QEMU_KEY_ESC1(c) ((c) | 0xe100) diff --git a/hw/usb-hid.c b/hw/usb-hid.c index dbab5d3..88ef36c 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -55,6 +55,7 @@ typedef struct USBKeyboardState { uint8_t leds; uint8_t key[16]; int keys; + int keyboard_grabbed; QEMUPutKbdEntry *eh_entry; } USBKeyboardState; @@ -586,6 +587,11 @@ static int usb_keyboard_poll(USBKeyboardState *s, uint8_t *buf, int len) if (len < 2) return 0; + if (!s->keyboard_grabbed) { + qemu_activate_keyboard_event_handler(s->eh_entry); + s->keyboard_grabbed = 1; + } + buf[0] = s->modifiers & 0xff; buf[1] = 0; if (s->keys > 6) diff --git a/input.c b/input.c index 18875a9..da43ee5 100644 --- a/input.c +++ b/input.c @@ -329,3 +329,114 @@ void qemu_remove_mouse_mode_change_notifier(Notifier *notify) { notifier_list_remove(&mouse_mode_notifiers, notify); } + +static void info_keyboard_iter(QObject *data, void *opaque) +{ + QDict *kbd; + Monitor *mon = opaque; + + kbd = qobject_to_qdict(data); + monitor_printf(mon, "%c Keyboard #%" PRId64 ": %s\n", + (qdict_get_bool(kbd, "current") ? '*' : ' '), + qdict_get_int(kbd, "index"), qdict_get_str(kbd, "name")); +} + +void do_info_keyboard_print(Monitor *mon, const QObject *data) +{ + QList *kbd_list; + + kbd_list = qobject_to_qlist(data); + if (qlist_empty(kbd_list)) { + monitor_printf(mon, "No keyboard devices connected\n"); + return; + } + + qlist_iter(kbd_list, info_keyboard_iter, mon); +} + +void qemu_activate_keyboard_event_handler(QEMUPutKbdEntry *entry) +{ + QTAILQ_REMOVE(&kbd_handlers, entry, node); + QTAILQ_INSERT_HEAD(&kbd_handlers, entry, node); +} + +/* + * do_info_keyboard(): Show VM keyboard information + * + * Each keyboard is represented by a QDict, the returned QObject is + * a QList of all keyboards. + * + * The keyboard QDict contains the following: + * + * - "name": keyboard's name + * - "index": keyboard's index + * - "current": true if this keyboard is receiving events, false otherwise + * + * Example: + * + * [ { "name": "QEMU USB Keyboard", "index": 0, "current": false }, + * { "name": "QEMU PS/2 Keyboard", "index": 1, "current": true } ] + */ +void do_info_keyboard(Monitor *mon, QObject **ret_data) +{ + QEMUPutKbdEntry *cursor; + QList *kbd_list; + int current; + + kbd_list = qlist_new(); + + if (QTAILQ_EMPTY(&kbd_handlers)) { + goto out; + } + + current = QTAILQ_FIRST(&kbd_handlers)->index; + QTAILQ_FOREACH(cursor, &kbd_handlers, node) { + QObject *obj; + obj = qobject_from_jsonf("{ 'name': %s," + " 'index': %d," + " 'current': %i }", + cursor->qemu_put_kbd_name, + cursor->index, + current == cursor->index); + qlist_append_obj(kbd_list, obj); + } +out: + *ret_data = QOBJECT(kbd_list); +} + +/* + * do_keyboard_set(): Set active keyboard + * + * Argument qdict contains + * - "index": the keyboard index to set + * + * Example: + * + * { "index": "0" } + */ +int do_keyboard_set(Monitor *mon, const QDict *qdict, QObject **ret_data) +{ + QEMUPutKbdEntry *cursor; + int index = qdict_get_int(qdict, "index"); + int found = 0; + + if (QTAILQ_EMPTY(&kbd_handlers)) { + qerror_report(QERR_DEVICE_NOT_FOUND, "keyboard"); + return -1; + } + + QTAILQ_FOREACH(cursor, &kbd_handlers, node) { + if (cursor->index == index) { + qemu_activate_keyboard_event_handler(cursor); + found = 1; + break; + } + } + + if (!found) { + qerror_report(QERR_INVALID_PARAMETER, "index"); + return -1; + } + + return 0; +} diff --git a/monitor.c b/monitor.c index 822dc27..f5474b1 100644 --- a/monitor.c +++ b/monitor.c @@ -2781,6 +2781,14 @@ static const mon_cmd_t info_cmds[] = { .mhandler.info_new = do_info_mice, }, { + .name = "keyboard", + .args_type = "", + .params = "", + .help = "show which guest keyboard is receiving events", + .user_print = do_info_keyboard_print, + .mhandler.info_new = do_info_keyboard, + }, + { .name = "vnc", .args_type = "", .params = "", diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 5308f36..e9beb12 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -659,6 +659,23 @@ info mice @end example ETEXI + { + .name = "keyboard_set", + .args_type = "index:i", + .params = "index", + .help = "set which keyboard device receives events", + .mhandler.cmd_new = do_keyboard_set, + }, + +STEXI +@item keyboard_set @var{index} +@findex keyboard_set +Set which keyboard device receives events at given @var{index}, index +can be obtained with +@example +info keyboard +@end example +ETEXI #ifdef HAS_AUDIO { .name = "wavcapture",