From nobody Fri May 3 05:30:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513088145362904.2088359531986; Tue, 12 Dec 2017 06:15:45 -0800 (PST) Received: from localhost ([::1]:58572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOlLO-0007g0-Gj for importer@patchew.org; Tue, 12 Dec 2017 09:15:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOlGz-0002lZ-Mt for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOlGr-0001Mf-U2 for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46038) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eOlGr-0001LN-Kh for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:10:57 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 795D680C1A; Tue, 12 Dec 2017 14:10:56 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6995A620C7; Tue, 12 Dec 2017 14:10:54 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 12 Dec 2017 14:10:41 +0000 Message-Id: <20171212141044.2582-2-berrange@redhat.com> In-Reply-To: <20171212141044.2582-1-berrange@redhat.com> References: <20171212141044.2582-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 12 Dec 2017 14:10:56 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 1/4] hw: convert virtio-input-hid device to keycodemapdb X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Gerd Hoffmann , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Replace the keymap_qcode table with automatically generated tables. Missing entries in keymap_qcode now fixed: Q_KEY_CODE_ASTERISK -> KEY_KPASTERISK Q_KEY_CODE_KP_MULTIPLY -> KEY_KPASTERISK Q_KEY_CODE_STOP -> KEY_STOP Q_KEY_CODE_AGAIN -> KEY_AGAIN Q_KEY_CODE_PROPS -> KEY_PROPS Q_KEY_CODE_UNDO -> KEY_UNDO Q_KEY_CODE_FRONT -> KEY_FRONT Q_KEY_CODE_COPY -> KEY_COPY Q_KEY_CODE_OPEN -> KEY_OPEN Q_KEY_CODE_PASTE -> KEY_PASTE Q_KEY_CODE_FIND -> KEY_FIND Q_KEY_CODE_CUT -> KEY_CUT Q_KEY_CODE_LF -> KEY_LINEFEED Q_KEY_CODE_HELP -> KEY_HELP Q_KEY_CODE_COMPOSE -> KEY_COMPOSE Q_KEY_CODE_RO -> KEY_RO Q_KEY_CODE_HIRAGANA -> KEY_HIRAGANA Q_KEY_CODE_HENKAN -> KEY_HENKAN Q_KEY_CODE_YEN -> KEY_YEN Q_KEY_CODE_KP_COMMA -> KEY_KPCOMMA Q_KEY_CODE_KP_EQUALS -> KEY_KPEQUAL Q_KEY_CODE_POWER -> KEY_POWER Q_KEY_CODE_SLEEP -> KEY_SLEEP Q_KEY_CODE_WAKE -> KEY_WAKEUP Q_KEY_CODE_AUDIONEXT -> KEY_NEXTSONG Q_KEY_CODE_AUDIOPREV -> KEY_PREVIOUSSONG Q_KEY_CODE_AUDIOSTOP -> KEY_STOPCD Q_KEY_CODE_AUDIOPLAY -> KEY_PLAYPAUSE Q_KEY_CODE_AUDIOMUTE -> KEY_MUTE Q_KEY_CODE_VOLUMEUP -> KEY_VOLUMEUP Q_KEY_CODE_VOLUMEDOWN -> KEY_VOLUMEDOWN Q_KEY_CODE_MEDIASELECT -> KEY_MEDIA Q_KEY_CODE_MAIL -> KEY_MAIL Q_KEY_CODE_CALCULATOR -> KEY_CALC Q_KEY_CODE_COMPUTER -> KEY_COMPUTER Q_KEY_CODE_AC_HOME -> KEY_HOMEPAGE Q_KEY_CODE_AC_BACK -> KEY_BACK Q_KEY_CODE_AC_FORWARD -> KEY_FORWARD Q_KEY_CODE_AC_REFRESH -> KEY_REFRESH Q_KEY_CODE_AC_BOOKMARKS -> KEY_BOOKMARKS NB, the virtio-input device reports a bitmask to the guest driver that has a bit set for each Linux keycode that the host is able to send to the guest. Thus by adding these extra key mappings we are technically changing the host<->guest ABI. This would also happen any time we defined new mappings for QEMU keycodes in future. When a keycode is removed from the list of possible keycodes that host can send to the guest, it means that the guest OS will think it is possible to receive a key that in pratice can never be generated, which is harmless. When a keycode is added to the list of possible keycodes that the host can send to the guest, it means that the guest OS can see an unexpected event. The Linux virtio_input.c driver code simply forwards this event to the input_event() method in the Linux input subsystem. This in turn calls input_handle_event(), which then calls input_get_disposition(). This method checks if the input event is present in the permitted keys bitmap, and if not returns INPUT_IGNORE_EVENT. Thus the unexpected event will get dropped, which is harmless. If the guest OS reboots, or otherwise re-initializes the virt-input device, it will read the new keycode bitmap. No matter how many keys are defined, the config space has a fixed 128 byte bitmap. There is, however, a size field defiend which says how many bytes in the bitmap are used. So the guest OS reads the size of the bitmap, and then it reads the data from bitmap upto the designated size. So if the guest OS re-initializes at precisely the time that QEMU is migrated across versions, in the worst case, it could conceiva= bly read the old size field, but then get the newly updated bitmap. If a key w= ere added this is harmless, since it simply means it may not process the newly added key. If a key were removed, then it could be readnig a byte from the bitmap that was not initialized. Fortunately QEMU always memsets() the enti= re bitmap to 0, prior to setting keybits. Thus the guest OS will simply read zeros, which is again harmless. Based on this analysis, it is believed that there is no need to preserve the virtio-input-hid keymaps across migration, as the host<->guest ABI change is harmless and self-resolving at time of guest reboot. NB, this behaviour should perhaps be formalized in the virtio-input spec to declare how guest OS drivers should be written to be robust in their handling of the potentially changable key bitmaps. Signed-off-by: Daniel P. Berrange --- Makefile | 1 + hw/input/virtio-input-hid.c | 136 +++-------------------------------------= ---- include/ui/input.h | 3 + ui/input-keymap.c | 1 + 4 files changed, 14 insertions(+), 127 deletions(-) diff --git a/Makefile b/Makefile index ab0354c153..5aaff5fe1e 100644 --- a/Makefile +++ b/Makefile @@ -227,6 +227,7 @@ KEYCODEMAP_CSV =3D $(SRC_PATH)/ui/keycodemapdb/data/key= maps.csv =20 KEYCODEMAP_FILES =3D \ ui/input-keymap-linux-to-qcode.c \ + ui/input-keymap-qcode-to-linux.c \ ui/input-keymap-qcode-to-qnum.c \ ui/input-keymap-qnum-to-qcode.c \ $(NULL) diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index e78faec0b1..bd89c3e6ae 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -22,126 +22,7 @@ =20 /* ----------------------------------------------------------------- */ =20 -static const unsigned int keymap_qcode[Q_KEY_CODE__MAX] =3D { - [Q_KEY_CODE_ESC] =3D KEY_ESC, - [Q_KEY_CODE_1] =3D KEY_1, - [Q_KEY_CODE_2] =3D KEY_2, - [Q_KEY_CODE_3] =3D KEY_3, - [Q_KEY_CODE_4] =3D KEY_4, - [Q_KEY_CODE_5] =3D KEY_5, - [Q_KEY_CODE_6] =3D KEY_6, - [Q_KEY_CODE_7] =3D KEY_7, - [Q_KEY_CODE_8] =3D KEY_8, - [Q_KEY_CODE_9] =3D KEY_9, - [Q_KEY_CODE_0] =3D KEY_0, - [Q_KEY_CODE_MINUS] =3D KEY_MINUS, - [Q_KEY_CODE_EQUAL] =3D KEY_EQUAL, - [Q_KEY_CODE_BACKSPACE] =3D KEY_BACKSPACE, - - [Q_KEY_CODE_TAB] =3D KEY_TAB, - [Q_KEY_CODE_Q] =3D KEY_Q, - [Q_KEY_CODE_W] =3D KEY_W, - [Q_KEY_CODE_E] =3D KEY_E, - [Q_KEY_CODE_R] =3D KEY_R, - [Q_KEY_CODE_T] =3D KEY_T, - [Q_KEY_CODE_Y] =3D KEY_Y, - [Q_KEY_CODE_U] =3D KEY_U, - [Q_KEY_CODE_I] =3D KEY_I, - [Q_KEY_CODE_O] =3D KEY_O, - [Q_KEY_CODE_P] =3D KEY_P, - [Q_KEY_CODE_BRACKET_LEFT] =3D KEY_LEFTBRACE, - [Q_KEY_CODE_BRACKET_RIGHT] =3D KEY_RIGHTBRACE, - [Q_KEY_CODE_RET] =3D KEY_ENTER, - - [Q_KEY_CODE_CTRL] =3D KEY_LEFTCTRL, - [Q_KEY_CODE_A] =3D KEY_A, - [Q_KEY_CODE_S] =3D KEY_S, - [Q_KEY_CODE_D] =3D KEY_D, - [Q_KEY_CODE_F] =3D KEY_F, - [Q_KEY_CODE_G] =3D KEY_G, - [Q_KEY_CODE_H] =3D KEY_H, - [Q_KEY_CODE_J] =3D KEY_J, - [Q_KEY_CODE_K] =3D KEY_K, - [Q_KEY_CODE_L] =3D KEY_L, - [Q_KEY_CODE_SEMICOLON] =3D KEY_SEMICOLON, - [Q_KEY_CODE_APOSTROPHE] =3D KEY_APOSTROPHE, - [Q_KEY_CODE_GRAVE_ACCENT] =3D KEY_GRAVE, - - [Q_KEY_CODE_SHIFT] =3D KEY_LEFTSHIFT, - [Q_KEY_CODE_BACKSLASH] =3D KEY_BACKSLASH, - [Q_KEY_CODE_LESS] =3D KEY_102ND, - [Q_KEY_CODE_Z] =3D KEY_Z, - [Q_KEY_CODE_X] =3D KEY_X, - [Q_KEY_CODE_C] =3D KEY_C, - [Q_KEY_CODE_V] =3D KEY_V, - [Q_KEY_CODE_B] =3D KEY_B, - [Q_KEY_CODE_N] =3D KEY_N, - [Q_KEY_CODE_M] =3D KEY_M, - [Q_KEY_CODE_COMMA] =3D KEY_COMMA, - [Q_KEY_CODE_DOT] =3D KEY_DOT, - [Q_KEY_CODE_SLASH] =3D KEY_SLASH, - [Q_KEY_CODE_SHIFT_R] =3D KEY_RIGHTSHIFT, - - [Q_KEY_CODE_ALT] =3D KEY_LEFTALT, - [Q_KEY_CODE_SPC] =3D KEY_SPACE, - [Q_KEY_CODE_CAPS_LOCK] =3D KEY_CAPSLOCK, - - [Q_KEY_CODE_F1] =3D KEY_F1, - [Q_KEY_CODE_F2] =3D KEY_F2, - [Q_KEY_CODE_F3] =3D KEY_F3, - [Q_KEY_CODE_F4] =3D KEY_F4, - [Q_KEY_CODE_F5] =3D KEY_F5, - [Q_KEY_CODE_F6] =3D KEY_F6, - [Q_KEY_CODE_F7] =3D KEY_F7, - [Q_KEY_CODE_F8] =3D KEY_F8, - [Q_KEY_CODE_F9] =3D KEY_F9, - [Q_KEY_CODE_F10] =3D KEY_F10, - [Q_KEY_CODE_NUM_LOCK] =3D KEY_NUMLOCK, - [Q_KEY_CODE_SCROLL_LOCK] =3D KEY_SCROLLLOCK, - - [Q_KEY_CODE_KP_0] =3D KEY_KP0, - [Q_KEY_CODE_KP_1] =3D KEY_KP1, - [Q_KEY_CODE_KP_2] =3D KEY_KP2, - [Q_KEY_CODE_KP_3] =3D KEY_KP3, - [Q_KEY_CODE_KP_4] =3D KEY_KP4, - [Q_KEY_CODE_KP_5] =3D KEY_KP5, - [Q_KEY_CODE_KP_6] =3D KEY_KP6, - [Q_KEY_CODE_KP_7] =3D KEY_KP7, - [Q_KEY_CODE_KP_8] =3D KEY_KP8, - [Q_KEY_CODE_KP_9] =3D KEY_KP9, - [Q_KEY_CODE_KP_SUBTRACT] =3D KEY_KPMINUS, - [Q_KEY_CODE_KP_ADD] =3D KEY_KPPLUS, - [Q_KEY_CODE_KP_DECIMAL] =3D KEY_KPDOT, - [Q_KEY_CODE_KP_ENTER] =3D KEY_KPENTER, - [Q_KEY_CODE_KP_DIVIDE] =3D KEY_KPSLASH, - [Q_KEY_CODE_KP_MULTIPLY] =3D KEY_KPASTERISK, - - [Q_KEY_CODE_F11] =3D KEY_F11, - [Q_KEY_CODE_F12] =3D KEY_F12, - - [Q_KEY_CODE_CTRL_R] =3D KEY_RIGHTCTRL, - [Q_KEY_CODE_SYSRQ] =3D KEY_SYSRQ, - [Q_KEY_CODE_PRINT] =3D KEY_SYSRQ, - [Q_KEY_CODE_PAUSE] =3D KEY_PAUSE, - [Q_KEY_CODE_ALT_R] =3D KEY_RIGHTALT, - - [Q_KEY_CODE_HOME] =3D KEY_HOME, - [Q_KEY_CODE_UP] =3D KEY_UP, - [Q_KEY_CODE_PGUP] =3D KEY_PAGEUP, - [Q_KEY_CODE_LEFT] =3D KEY_LEFT, - [Q_KEY_CODE_RIGHT] =3D KEY_RIGHT, - [Q_KEY_CODE_END] =3D KEY_END, - [Q_KEY_CODE_DOWN] =3D KEY_DOWN, - [Q_KEY_CODE_PGDN] =3D KEY_PAGEDOWN, - [Q_KEY_CODE_INSERT] =3D KEY_INSERT, - [Q_KEY_CODE_DELETE] =3D KEY_DELETE, - - [Q_KEY_CODE_META_L] =3D KEY_LEFTMETA, - [Q_KEY_CODE_META_R] =3D KEY_RIGHTMETA, - [Q_KEY_CODE_MENU] =3D KEY_MENU, -}; - -static const unsigned int keymap_button[INPUT_BUTTON__MAX] =3D { +static const unsigned short keymap_button[INPUT_BUTTON__MAX] =3D { [INPUT_BUTTON_LEFT] =3D BTN_LEFT, [INPUT_BUTTON_RIGHT] =3D BTN_RIGHT, [INPUT_BUTTON_MIDDLE] =3D BTN_MIDDLE, @@ -149,12 +30,12 @@ static const unsigned int keymap_button[INPUT_BUTTON__= MAX] =3D { [INPUT_BUTTON_WHEEL_DOWN] =3D BTN_GEAR_DOWN, }; =20 -static const unsigned int axismap_rel[INPUT_AXIS__MAX] =3D { +static const unsigned short axismap_rel[INPUT_AXIS__MAX] =3D { [INPUT_AXIS_X] =3D REL_X, [INPUT_AXIS_Y] =3D REL_Y, }; =20 -static const unsigned int axismap_abs[INPUT_AXIS__MAX] =3D { +static const unsigned short axismap_abs[INPUT_AXIS__MAX] =3D { [INPUT_AXIS_X] =3D ABS_X, [INPUT_AXIS_Y] =3D ABS_Y, }; @@ -162,7 +43,7 @@ static const unsigned int axismap_abs[INPUT_AXIS__MAX] = =3D { /* ----------------------------------------------------------------- */ =20 static void virtio_input_key_config(VirtIOInput *vinput, - const unsigned int *keymap, + const unsigned short *keymap, size_t mapsize) { virtio_input_config keys; @@ -202,9 +83,10 @@ static void virtio_input_handle_event(DeviceState *dev,= QemuConsole *src, case INPUT_EVENT_KIND_KEY: key =3D evt->u.key.data; qcode =3D qemu_input_key_value_to_qcode(key->key); - if (qcode && keymap_qcode[qcode]) { + if (qcode < qemu_input_map_qcode_to_linux_len && + qemu_input_map_qcode_to_linux[qcode]) { event.type =3D cpu_to_le16(EV_KEY); - event.code =3D cpu_to_le16(keymap_qcode[qcode]); + event.code =3D cpu_to_le16(qemu_input_map_qcode_to_linux[qcod= e]); event.value =3D cpu_to_le32(key->down ? 1 : 0); virtio_input_send(vinput, &event); } else { @@ -395,8 +277,8 @@ static void virtio_keyboard_init(Object *obj) =20 vhid->handler =3D &virtio_keyboard_handler; virtio_input_init_config(vinput, virtio_keyboard_config); - virtio_input_key_config(vinput, keymap_qcode, - ARRAY_SIZE(keymap_qcode)); + virtio_input_key_config(vinput, qemu_input_map_qcode_to_linux, + qemu_input_map_qcode_to_linux_len); } =20 static const TypeInfo virtio_keyboard_info =3D { diff --git a/include/ui/input.h b/include/ui/input.h index f8cee43f65..6f56d868c7 100644 --- a/include/ui/input.h +++ b/include/ui/input.h @@ -71,6 +71,9 @@ void qemu_remove_mouse_mode_change_notifier(Notifier *not= ify); extern const guint qemu_input_map_linux_to_qcode_len; extern const guint16 qemu_input_map_linux_to_qcode[]; =20 +extern const guint qemu_input_map_qcode_to_linux_len; +extern const guint16 qemu_input_map_qcode_to_linux[]; + extern const guint qemu_input_map_qcode_to_qnum_len; extern const guint16 qemu_input_map_qcode_to_qnum[]; =20 diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 3a19a169f5..6e543d651f 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -6,6 +6,7 @@ #include "standard-headers/linux/input.h" =20 #include "ui/input-keymap-linux-to-qcode.c" +#include "ui/input-keymap-qcode-to-linux.c" #include "ui/input-keymap-qcode-to-qnum.c" #include "ui/input-keymap-qnum-to-qcode.c" =20 --=20 2.14.3 From nobody Fri May 3 05:30:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513088227675831.9038754912109; Tue, 12 Dec 2017 06:17:07 -0800 (PST) Received: from localhost ([::1]:58579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOlMc-0000Ie-0c for importer@patchew.org; Tue, 12 Dec 2017 09:16:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOlGx-0002jq-1n for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOlGt-0001QU-Rt for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37588) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eOlGt-0001OO-It for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:10:59 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9EE2CC07F985; Tue, 12 Dec 2017 14:10:58 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98B7F620BC; Tue, 12 Dec 2017 14:10:56 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 12 Dec 2017 14:10:42 +0000 Message-Id: <20171212141044.2582-3-berrange@redhat.com> In-Reply-To: <20171212141044.2582-1-berrange@redhat.com> References: <20171212141044.2582-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 12 Dec 2017 14:10:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 2/4] hw: convert ps2 device to keycodemapdb X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Gerd Hoffmann , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Replace the qcode_to_keycode_set1, qcode_to_keycode_set2, and qcode_to_keycode_set3 tables with automatically generated tables. Missing entries in qcode_to_keycode_set1 now fixed: - Q_KEY_CODE_SYSRQ -> 0x54 - Q_KEY_CODE_PRINT -> 0x54 (NB ignored due to special case) - Q_KEY_CODE_AGAIN -> 0xe005 - Q_KEY_CODE_PROPS -> 0xe006 - Q_KEY_CODE_UNDO -> 0xe007 - Q_KEY_CODE_FRONT -> 0xe00c - Q_KEY_CODE_COPY -> 0xe078 - Q_KEY_CODE_OPEN -> 0x64 - Q_KEY_CODE_PASTE -> 0x65 - Q_KEY_CODE_CUT -> 0xe03c - Q_KEY_CODE_LF -> 0x5b - Q_KEY_CODE_HELP -> 0xe075 - Q_KEY_CODE_COMPOSE -> 0xe05d - Q_KEY_CODE_PAUSE -> 0xe046 - Q_KEY_CODE_KP_EQUALS -> 0x59 And some mistakes corrected: - Q_KEY_CODE_HIRAGANA was mapped to 0x70 (Katakanahiragana) instead of of 0x77 (Hirigana) - Q_KEY_CODE_MENU was incorrectly mapped to the compose scancode (0xe05d) and is now mapped to 0xe01e - Q_KEY_CODE_FIND was mapped to 0xe065 (Search) instead of to 0xe041 (Find) - Q_KEY_CODE_POWER, SLEEP & WAKE had 0x0e instead of 0xe0 as the prefix Missing entries in qcode_to_keycode_set2 now fixed: - Q_KEY_CODE_PRINT -> 0x7f (NB ignored due to special case) - Q_KEY_CODE_COMPOSE -> 0xe02f - Q_KEY_CODE_PAUSE -> 0xe077 - Q_KEY_CODE_KP_EQUALS -> 0x0f And some mistakes corrected: - Q_KEY_CODE_HIRAGANA was mapped to 0x13 (Katakanahiragana) instead of of 0x62 (Hirigana) - Q_KEY_CODE_MENU was incorrectly mapped to the compose scancode (0xe02f) and is now not mapped - Q_KEY_CODE_FIND was mapped to 0xe010 (Search) and is now not mapped. - Q_KEY_CODE_POWER, SLEEP & WAKE had 0x0e instead of 0xe0 as the prefix Missing entries in qcode_to_keycode_set3 now fixed: - Q_KEY_CODE_ASTERISK -> 0x7e - Q_KEY_CODE_SYSRQ -> 0x57 - Q_KEY_CODE_LESS -> 0x13 - Q_KEY_CODE_STOP -> 0x0a - Q_KEY_CODE_AGAIN -> 0x0b - Q_KEY_CODE_PROPS -> 0x0c - Q_KEY_CODE_UNDO -> 0x10 - Q_KEY_CODE_COPY -> 0x18 - Q_KEY_CODE_OPEN -> 0x20 - Q_KEY_CODE_PASTE -> 0x28 - Q_KEY_CODE_FIND -> 0x30 - Q_KEY_CODE_CUT -> 0x38 - Q_KEY_CODE_HELP -> 0x09 - Q_KEY_CODE_COMPOSE -> 0x8d - Q_KEY_CODE_AUDIONEXT -> 0x93 - Q_KEY_CODE_AUDIOPREV -> 0x94 - Q_KEY_CODE_AUDIOSTOP -> 0x98 - Q_KEY_CODE_AUDIOMUTE -> 0x9c - Q_KEY_CODE_VOLUMEUP -> 0x95 - Q_KEY_CODE_VOLUMEDOWN -> 0x9d - Q_KEY_CODE_CALCULATOR -> 0xa3 - Q_KEY_CODE_AC_HOME -> 0x97 And some mistakes corrected: - Q_KEY_CODE_MENU was incorrectly mapped to the compose scancode (0x8d) and is now 0x91 Signed-off-by: Daniel P. Berrange --- Makefile | 3 + hw/input/ps2.c | 406 +------------------------------------------------= ---- include/ui/input.h | 9 ++ ui/input-keymap.c | 3 + 4 files changed, 22 insertions(+), 399 deletions(-) diff --git a/Makefile b/Makefile index 5aaff5fe1e..1e4237fd2f 100644 --- a/Makefile +++ b/Makefile @@ -227,6 +227,9 @@ KEYCODEMAP_CSV =3D $(SRC_PATH)/ui/keycodemapdb/data/key= maps.csv =20 KEYCODEMAP_FILES =3D \ ui/input-keymap-linux-to-qcode.c \ + ui/input-keymap-qcode-to-atset1.c \ + ui/input-keymap-qcode-to-atset2.c \ + ui/input-keymap-qcode-to-atset3.c \ ui/input-keymap-qcode-to-linux.c \ ui/input-keymap-qcode-to-qnum.c \ ui/input-keymap-qnum-to-qcode.c \ diff --git a/hw/input/ps2.c b/hw/input/ps2.c index f388a23c8e..9eca6a4356 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -124,401 +124,6 @@ typedef struct { uint8_t mouse_buttons; } PS2MouseState; =20 -/* Table to convert from QEMU codes to scancodes. */ -static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] =3D { - [0 ... Q_KEY_CODE__MAX - 1] =3D 0, - - [Q_KEY_CODE_A] =3D 0x1e, - [Q_KEY_CODE_B] =3D 0x30, - [Q_KEY_CODE_C] =3D 0x2e, - [Q_KEY_CODE_D] =3D 0x20, - [Q_KEY_CODE_E] =3D 0x12, - [Q_KEY_CODE_F] =3D 0x21, - [Q_KEY_CODE_G] =3D 0x22, - [Q_KEY_CODE_H] =3D 0x23, - [Q_KEY_CODE_I] =3D 0x17, - [Q_KEY_CODE_J] =3D 0x24, - [Q_KEY_CODE_K] =3D 0x25, - [Q_KEY_CODE_L] =3D 0x26, - [Q_KEY_CODE_M] =3D 0x32, - [Q_KEY_CODE_N] =3D 0x31, - [Q_KEY_CODE_O] =3D 0x18, - [Q_KEY_CODE_P] =3D 0x19, - [Q_KEY_CODE_Q] =3D 0x10, - [Q_KEY_CODE_R] =3D 0x13, - [Q_KEY_CODE_S] =3D 0x1f, - [Q_KEY_CODE_T] =3D 0x14, - [Q_KEY_CODE_U] =3D 0x16, - [Q_KEY_CODE_V] =3D 0x2f, - [Q_KEY_CODE_W] =3D 0x11, - [Q_KEY_CODE_X] =3D 0x2d, - [Q_KEY_CODE_Y] =3D 0x15, - [Q_KEY_CODE_Z] =3D 0x2c, - [Q_KEY_CODE_0] =3D 0x0b, - [Q_KEY_CODE_1] =3D 0x02, - [Q_KEY_CODE_2] =3D 0x03, - [Q_KEY_CODE_3] =3D 0x04, - [Q_KEY_CODE_4] =3D 0x05, - [Q_KEY_CODE_5] =3D 0x06, - [Q_KEY_CODE_6] =3D 0x07, - [Q_KEY_CODE_7] =3D 0x08, - [Q_KEY_CODE_8] =3D 0x09, - [Q_KEY_CODE_9] =3D 0x0a, - [Q_KEY_CODE_GRAVE_ACCENT] =3D 0x29, - [Q_KEY_CODE_MINUS] =3D 0x0c, - [Q_KEY_CODE_EQUAL] =3D 0x0d, - [Q_KEY_CODE_BACKSLASH] =3D 0x2b, - [Q_KEY_CODE_BACKSPACE] =3D 0x0e, - [Q_KEY_CODE_SPC] =3D 0x39, - [Q_KEY_CODE_TAB] =3D 0x0f, - [Q_KEY_CODE_CAPS_LOCK] =3D 0x3a, - [Q_KEY_CODE_SHIFT] =3D 0x2a, - [Q_KEY_CODE_CTRL] =3D 0x1d, - [Q_KEY_CODE_META_L] =3D 0xe05b, - [Q_KEY_CODE_ALT] =3D 0x38, - [Q_KEY_CODE_SHIFT_R] =3D 0x36, - [Q_KEY_CODE_CTRL_R] =3D 0xe01d, - [Q_KEY_CODE_META_R] =3D 0xe05c, - [Q_KEY_CODE_ALT_R] =3D 0xe038, - [Q_KEY_CODE_MENU] =3D 0xe05d, - [Q_KEY_CODE_RET] =3D 0x1c, - [Q_KEY_CODE_ESC] =3D 0x01, - [Q_KEY_CODE_F1] =3D 0x3b, - [Q_KEY_CODE_F2] =3D 0x3c, - [Q_KEY_CODE_F3] =3D 0x3d, - [Q_KEY_CODE_F4] =3D 0x3e, - [Q_KEY_CODE_F5] =3D 0x3f, - [Q_KEY_CODE_F6] =3D 0x40, - [Q_KEY_CODE_F7] =3D 0x41, - [Q_KEY_CODE_F8] =3D 0x42, - [Q_KEY_CODE_F9] =3D 0x43, - [Q_KEY_CODE_F10] =3D 0x44, - [Q_KEY_CODE_F11] =3D 0x57, - [Q_KEY_CODE_F12] =3D 0x58, - /* special handling for Q_KEY_CODE_PRINT */ - [Q_KEY_CODE_SCROLL_LOCK] =3D 0x46, - /* special handling for Q_KEY_CODE_PAUSE */ - [Q_KEY_CODE_BRACKET_LEFT] =3D 0x1a, - [Q_KEY_CODE_INSERT] =3D 0xe052, - [Q_KEY_CODE_HOME] =3D 0xe047, - [Q_KEY_CODE_PGUP] =3D 0xe049, - [Q_KEY_CODE_DELETE] =3D 0xe053, - [Q_KEY_CODE_END] =3D 0xe04f, - [Q_KEY_CODE_PGDN] =3D 0xe051, - [Q_KEY_CODE_UP] =3D 0xe048, - [Q_KEY_CODE_LEFT] =3D 0xe04b, - [Q_KEY_CODE_DOWN] =3D 0xe050, - [Q_KEY_CODE_RIGHT] =3D 0xe04d, - [Q_KEY_CODE_NUM_LOCK] =3D 0x45, - [Q_KEY_CODE_KP_DIVIDE] =3D 0xe035, - [Q_KEY_CODE_KP_MULTIPLY] =3D 0x37, - [Q_KEY_CODE_KP_SUBTRACT] =3D 0x4a, - [Q_KEY_CODE_KP_ADD] =3D 0x4e, - [Q_KEY_CODE_KP_ENTER] =3D 0xe01c, - [Q_KEY_CODE_KP_DECIMAL] =3D 0x53, - [Q_KEY_CODE_KP_0] =3D 0x52, - [Q_KEY_CODE_KP_1] =3D 0x4f, - [Q_KEY_CODE_KP_2] =3D 0x50, - [Q_KEY_CODE_KP_3] =3D 0x51, - [Q_KEY_CODE_KP_4] =3D 0x4b, - [Q_KEY_CODE_KP_5] =3D 0x4c, - [Q_KEY_CODE_KP_6] =3D 0x4d, - [Q_KEY_CODE_KP_7] =3D 0x47, - [Q_KEY_CODE_KP_8] =3D 0x48, - [Q_KEY_CODE_KP_9] =3D 0x49, - [Q_KEY_CODE_BRACKET_RIGHT] =3D 0x1b, - [Q_KEY_CODE_SEMICOLON] =3D 0x27, - [Q_KEY_CODE_APOSTROPHE] =3D 0x28, - [Q_KEY_CODE_COMMA] =3D 0x33, - [Q_KEY_CODE_DOT] =3D 0x34, - [Q_KEY_CODE_SLASH] =3D 0x35, - - [Q_KEY_CODE_POWER] =3D 0x0e5e, - [Q_KEY_CODE_SLEEP] =3D 0x0e5f, - [Q_KEY_CODE_WAKE] =3D 0x0e63, - - [Q_KEY_CODE_AUDIONEXT] =3D 0xe019, - [Q_KEY_CODE_AUDIOPREV] =3D 0xe010, - [Q_KEY_CODE_AUDIOSTOP] =3D 0xe024, - [Q_KEY_CODE_AUDIOPLAY] =3D 0xe022, - [Q_KEY_CODE_AUDIOMUTE] =3D 0xe020, - [Q_KEY_CODE_VOLUMEUP] =3D 0xe030, - [Q_KEY_CODE_VOLUMEDOWN] =3D 0xe02e, - [Q_KEY_CODE_MEDIASELECT] =3D 0xe06d, - [Q_KEY_CODE_MAIL] =3D 0xe06c, - [Q_KEY_CODE_CALCULATOR] =3D 0xe021, - [Q_KEY_CODE_COMPUTER] =3D 0xe06b, - [Q_KEY_CODE_FIND] =3D 0xe065, - [Q_KEY_CODE_AC_HOME] =3D 0xe032, - [Q_KEY_CODE_AC_BACK] =3D 0xe06a, - [Q_KEY_CODE_AC_FORWARD] =3D 0xe069, - [Q_KEY_CODE_STOP] =3D 0xe068, - [Q_KEY_CODE_AC_REFRESH] =3D 0xe067, - [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe066, - - [Q_KEY_CODE_ASTERISK] =3D 0x37, - [Q_KEY_CODE_LESS] =3D 0x56, - [Q_KEY_CODE_RO] =3D 0x73, - [Q_KEY_CODE_HIRAGANA] =3D 0x70, - [Q_KEY_CODE_HENKAN] =3D 0x79, - [Q_KEY_CODE_YEN] =3D 0x7d, - [Q_KEY_CODE_KP_COMMA] =3D 0x7e, -}; - -static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] =3D { - [0 ... Q_KEY_CODE__MAX - 1] =3D 0, - - [Q_KEY_CODE_A] =3D 0x1c, - [Q_KEY_CODE_B] =3D 0x32, - [Q_KEY_CODE_C] =3D 0x21, - [Q_KEY_CODE_D] =3D 0x23, - [Q_KEY_CODE_E] =3D 0x24, - [Q_KEY_CODE_F] =3D 0x2b, - [Q_KEY_CODE_G] =3D 0x34, - [Q_KEY_CODE_H] =3D 0x33, - [Q_KEY_CODE_I] =3D 0x43, - [Q_KEY_CODE_J] =3D 0x3b, - [Q_KEY_CODE_K] =3D 0x42, - [Q_KEY_CODE_L] =3D 0x4b, - [Q_KEY_CODE_M] =3D 0x3a, - [Q_KEY_CODE_N] =3D 0x31, - [Q_KEY_CODE_O] =3D 0x44, - [Q_KEY_CODE_P] =3D 0x4d, - [Q_KEY_CODE_Q] =3D 0x15, - [Q_KEY_CODE_R] =3D 0x2d, - [Q_KEY_CODE_S] =3D 0x1b, - [Q_KEY_CODE_T] =3D 0x2c, - [Q_KEY_CODE_U] =3D 0x3c, - [Q_KEY_CODE_V] =3D 0x2a, - [Q_KEY_CODE_W] =3D 0x1d, - [Q_KEY_CODE_X] =3D 0x22, - [Q_KEY_CODE_Y] =3D 0x35, - [Q_KEY_CODE_Z] =3D 0x1a, - [Q_KEY_CODE_0] =3D 0x45, - [Q_KEY_CODE_1] =3D 0x16, - [Q_KEY_CODE_2] =3D 0x1e, - [Q_KEY_CODE_3] =3D 0x26, - [Q_KEY_CODE_4] =3D 0x25, - [Q_KEY_CODE_5] =3D 0x2e, - [Q_KEY_CODE_6] =3D 0x36, - [Q_KEY_CODE_7] =3D 0x3d, - [Q_KEY_CODE_8] =3D 0x3e, - [Q_KEY_CODE_9] =3D 0x46, - [Q_KEY_CODE_GRAVE_ACCENT] =3D 0x0e, - [Q_KEY_CODE_MINUS] =3D 0x4e, - [Q_KEY_CODE_EQUAL] =3D 0x55, - [Q_KEY_CODE_BACKSLASH] =3D 0x5d, - [Q_KEY_CODE_BACKSPACE] =3D 0x66, - [Q_KEY_CODE_SPC] =3D 0x29, - [Q_KEY_CODE_TAB] =3D 0x0d, - [Q_KEY_CODE_CAPS_LOCK] =3D 0x58, - [Q_KEY_CODE_SHIFT] =3D 0x12, - [Q_KEY_CODE_CTRL] =3D 0x14, - [Q_KEY_CODE_META_L] =3D 0xe01f, - [Q_KEY_CODE_ALT] =3D 0x11, - [Q_KEY_CODE_SHIFT_R] =3D 0x59, - [Q_KEY_CODE_CTRL_R] =3D 0xe014, - [Q_KEY_CODE_META_R] =3D 0xe027, - [Q_KEY_CODE_ALT_R] =3D 0xe011, - [Q_KEY_CODE_MENU] =3D 0xe02f, - [Q_KEY_CODE_RET] =3D 0x5a, - [Q_KEY_CODE_ESC] =3D 0x76, - [Q_KEY_CODE_F1] =3D 0x05, - [Q_KEY_CODE_F2] =3D 0x06, - [Q_KEY_CODE_F3] =3D 0x04, - [Q_KEY_CODE_F4] =3D 0x0c, - [Q_KEY_CODE_F5] =3D 0x03, - [Q_KEY_CODE_F6] =3D 0x0b, - [Q_KEY_CODE_F7] =3D 0x83, - [Q_KEY_CODE_F8] =3D 0x0a, - [Q_KEY_CODE_F9] =3D 0x01, - [Q_KEY_CODE_F10] =3D 0x09, - [Q_KEY_CODE_F11] =3D 0x78, - [Q_KEY_CODE_F12] =3D 0x07, - /* special handling for Q_KEY_CODE_PRINT */ - [Q_KEY_CODE_SCROLL_LOCK] =3D 0x7e, - /* special handling for Q_KEY_CODE_PAUSE */ - [Q_KEY_CODE_BRACKET_LEFT] =3D 0x54, - [Q_KEY_CODE_INSERT] =3D 0xe070, - [Q_KEY_CODE_HOME] =3D 0xe06c, - [Q_KEY_CODE_PGUP] =3D 0xe07d, - [Q_KEY_CODE_DELETE] =3D 0xe071, - [Q_KEY_CODE_END] =3D 0xe069, - [Q_KEY_CODE_PGDN] =3D 0xe07a, - [Q_KEY_CODE_UP] =3D 0xe075, - [Q_KEY_CODE_LEFT] =3D 0xe06b, - [Q_KEY_CODE_DOWN] =3D 0xe072, - [Q_KEY_CODE_RIGHT] =3D 0xe074, - [Q_KEY_CODE_NUM_LOCK] =3D 0x77, - [Q_KEY_CODE_KP_DIVIDE] =3D 0xe04a, - [Q_KEY_CODE_KP_MULTIPLY] =3D 0x7c, - [Q_KEY_CODE_KP_SUBTRACT] =3D 0x7b, - [Q_KEY_CODE_KP_ADD] =3D 0x79, - [Q_KEY_CODE_KP_ENTER] =3D 0xe05a, - [Q_KEY_CODE_KP_DECIMAL] =3D 0x71, - [Q_KEY_CODE_KP_0] =3D 0x70, - [Q_KEY_CODE_KP_1] =3D 0x69, - [Q_KEY_CODE_KP_2] =3D 0x72, - [Q_KEY_CODE_KP_3] =3D 0x7a, - [Q_KEY_CODE_KP_4] =3D 0x6b, - [Q_KEY_CODE_KP_5] =3D 0x73, - [Q_KEY_CODE_KP_6] =3D 0x74, - [Q_KEY_CODE_KP_7] =3D 0x6c, - [Q_KEY_CODE_KP_8] =3D 0x75, - [Q_KEY_CODE_KP_9] =3D 0x7d, - [Q_KEY_CODE_BRACKET_RIGHT] =3D 0x5b, - [Q_KEY_CODE_SEMICOLON] =3D 0x4c, - [Q_KEY_CODE_APOSTROPHE] =3D 0x52, - [Q_KEY_CODE_COMMA] =3D 0x41, - [Q_KEY_CODE_DOT] =3D 0x49, - [Q_KEY_CODE_SLASH] =3D 0x4a, - - [Q_KEY_CODE_POWER] =3D 0x0e37, - [Q_KEY_CODE_SLEEP] =3D 0x0e3f, - [Q_KEY_CODE_WAKE] =3D 0x0e5e, - - [Q_KEY_CODE_AUDIONEXT] =3D 0xe04d, - [Q_KEY_CODE_AUDIOPREV] =3D 0xe015, - [Q_KEY_CODE_AUDIOSTOP] =3D 0xe03b, - [Q_KEY_CODE_AUDIOPLAY] =3D 0xe034, - [Q_KEY_CODE_AUDIOMUTE] =3D 0xe023, - [Q_KEY_CODE_VOLUMEUP] =3D 0xe032, - [Q_KEY_CODE_VOLUMEDOWN] =3D 0xe021, - [Q_KEY_CODE_MEDIASELECT] =3D 0xe050, - [Q_KEY_CODE_MAIL] =3D 0xe048, - [Q_KEY_CODE_CALCULATOR] =3D 0xe02b, - [Q_KEY_CODE_COMPUTER] =3D 0xe040, - [Q_KEY_CODE_FIND] =3D 0xe010, - [Q_KEY_CODE_AC_HOME] =3D 0xe03a, - [Q_KEY_CODE_AC_BACK] =3D 0xe038, - [Q_KEY_CODE_AC_FORWARD] =3D 0xe030, - [Q_KEY_CODE_STOP] =3D 0xe028, - [Q_KEY_CODE_AC_REFRESH] =3D 0xe020, - [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe018, - - [Q_KEY_CODE_ASTERISK] =3D 0x7c, - [Q_KEY_CODE_LESS] =3D 0x61, - [Q_KEY_CODE_SYSRQ] =3D 0x7f, - [Q_KEY_CODE_RO] =3D 0x51, - [Q_KEY_CODE_HIRAGANA] =3D 0x13, - [Q_KEY_CODE_HENKAN] =3D 0x64, - [Q_KEY_CODE_YEN] =3D 0x6a, - [Q_KEY_CODE_KP_COMMA] =3D 0x6d, -}; - -static const uint16_t qcode_to_keycode_set3[Q_KEY_CODE__MAX] =3D { - [0 ... Q_KEY_CODE__MAX - 1] =3D 0, - - [Q_KEY_CODE_A] =3D 0x1c, - [Q_KEY_CODE_B] =3D 0x32, - [Q_KEY_CODE_C] =3D 0x21, - [Q_KEY_CODE_D] =3D 0x23, - [Q_KEY_CODE_E] =3D 0x24, - [Q_KEY_CODE_F] =3D 0x2b, - [Q_KEY_CODE_G] =3D 0x34, - [Q_KEY_CODE_H] =3D 0x33, - [Q_KEY_CODE_I] =3D 0x43, - [Q_KEY_CODE_J] =3D 0x3b, - [Q_KEY_CODE_K] =3D 0x42, - [Q_KEY_CODE_L] =3D 0x4b, - [Q_KEY_CODE_M] =3D 0x3a, - [Q_KEY_CODE_N] =3D 0x31, - [Q_KEY_CODE_O] =3D 0x44, - [Q_KEY_CODE_P] =3D 0x4d, - [Q_KEY_CODE_Q] =3D 0x15, - [Q_KEY_CODE_R] =3D 0x2d, - [Q_KEY_CODE_S] =3D 0x1b, - [Q_KEY_CODE_T] =3D 0x2c, - [Q_KEY_CODE_U] =3D 0x3c, - [Q_KEY_CODE_V] =3D 0x2a, - [Q_KEY_CODE_W] =3D 0x1d, - [Q_KEY_CODE_X] =3D 0x22, - [Q_KEY_CODE_Y] =3D 0x35, - [Q_KEY_CODE_Z] =3D 0x1a, - [Q_KEY_CODE_0] =3D 0x45, - [Q_KEY_CODE_1] =3D 0x16, - [Q_KEY_CODE_2] =3D 0x1e, - [Q_KEY_CODE_3] =3D 0x26, - [Q_KEY_CODE_4] =3D 0x25, - [Q_KEY_CODE_5] =3D 0x2e, - [Q_KEY_CODE_6] =3D 0x36, - [Q_KEY_CODE_7] =3D 0x3d, - [Q_KEY_CODE_8] =3D 0x3e, - [Q_KEY_CODE_9] =3D 0x46, - [Q_KEY_CODE_GRAVE_ACCENT] =3D 0x0e, - [Q_KEY_CODE_MINUS] =3D 0x4e, - [Q_KEY_CODE_EQUAL] =3D 0x55, - [Q_KEY_CODE_BACKSLASH] =3D 0x5c, - [Q_KEY_CODE_BACKSPACE] =3D 0x66, - [Q_KEY_CODE_SPC] =3D 0x29, - [Q_KEY_CODE_TAB] =3D 0x0d, - [Q_KEY_CODE_CAPS_LOCK] =3D 0x14, - [Q_KEY_CODE_SHIFT] =3D 0x12, - [Q_KEY_CODE_CTRL] =3D 0x11, - [Q_KEY_CODE_META_L] =3D 0x8b, - [Q_KEY_CODE_ALT] =3D 0x19, - [Q_KEY_CODE_SHIFT_R] =3D 0x59, - [Q_KEY_CODE_CTRL_R] =3D 0x58, - [Q_KEY_CODE_META_R] =3D 0x8c, - [Q_KEY_CODE_ALT_R] =3D 0x39, - [Q_KEY_CODE_MENU] =3D 0x8d, - [Q_KEY_CODE_RET] =3D 0x5a, - [Q_KEY_CODE_ESC] =3D 0x08, - [Q_KEY_CODE_F1] =3D 0x07, - [Q_KEY_CODE_F2] =3D 0x0f, - [Q_KEY_CODE_F3] =3D 0x17, - [Q_KEY_CODE_F4] =3D 0x1f, - [Q_KEY_CODE_F5] =3D 0x27, - [Q_KEY_CODE_F6] =3D 0x2f, - [Q_KEY_CODE_F7] =3D 0x37, - [Q_KEY_CODE_F8] =3D 0x3f, - [Q_KEY_CODE_F9] =3D 0x47, - [Q_KEY_CODE_F10] =3D 0x4f, - [Q_KEY_CODE_F11] =3D 0x56, - [Q_KEY_CODE_F12] =3D 0x5e, - [Q_KEY_CODE_PRINT] =3D 0x57, - [Q_KEY_CODE_SCROLL_LOCK] =3D 0x5f, - [Q_KEY_CODE_PAUSE] =3D 0x62, - [Q_KEY_CODE_BRACKET_LEFT] =3D 0x54, - [Q_KEY_CODE_INSERT] =3D 0x67, - [Q_KEY_CODE_HOME] =3D 0x6e, - [Q_KEY_CODE_PGUP] =3D 0x6f, - [Q_KEY_CODE_DELETE] =3D 0x64, - [Q_KEY_CODE_END] =3D 0x65, - [Q_KEY_CODE_PGDN] =3D 0x6d, - [Q_KEY_CODE_UP] =3D 0x63, - [Q_KEY_CODE_LEFT] =3D 0x61, - [Q_KEY_CODE_DOWN] =3D 0x60, - [Q_KEY_CODE_RIGHT] =3D 0x6a, - [Q_KEY_CODE_NUM_LOCK] =3D 0x76, - [Q_KEY_CODE_KP_DIVIDE] =3D 0x4a, - [Q_KEY_CODE_KP_MULTIPLY] =3D 0x7e, - [Q_KEY_CODE_KP_SUBTRACT] =3D 0x4e, - [Q_KEY_CODE_KP_ADD] =3D 0x7c, - [Q_KEY_CODE_KP_ENTER] =3D 0x79, - [Q_KEY_CODE_KP_DECIMAL] =3D 0x71, - [Q_KEY_CODE_KP_0] =3D 0x70, - [Q_KEY_CODE_KP_1] =3D 0x69, - [Q_KEY_CODE_KP_2] =3D 0x72, - [Q_KEY_CODE_KP_3] =3D 0x7a, - [Q_KEY_CODE_KP_4] =3D 0x6b, - [Q_KEY_CODE_KP_5] =3D 0x73, - [Q_KEY_CODE_KP_6] =3D 0x74, - [Q_KEY_CODE_KP_7] =3D 0x6c, - [Q_KEY_CODE_KP_8] =3D 0x75, - [Q_KEY_CODE_KP_9] =3D 0x7d, - [Q_KEY_CODE_BRACKET_RIGHT] =3D 0x5b, - [Q_KEY_CODE_SEMICOLON] =3D 0x4c, - [Q_KEY_CODE_APOSTROPHE] =3D 0x52, - [Q_KEY_CODE_COMMA] =3D 0x41, - [Q_KEY_CODE_DOT] =3D 0x49, - [Q_KEY_CODE_SLASH] =3D 0x4a, - - [Q_KEY_CODE_HIRAGANA] =3D 0x87, - [Q_KEY_CODE_HENKAN] =3D 0x86, - [Q_KEY_CODE_YEN] =3D 0x5d, -}; - static uint8_t translate_table[256] =3D { 0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58, 0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59, @@ -624,7 +229,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuCo= nsole *src, PS2KbdState *s =3D (PS2KbdState *)dev; InputKeyEvent *key =3D evt->u.key.data; int qcode; - uint16_t keycode; + uint16_t keycode =3D 0; int mod; =20 qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); @@ -706,7 +311,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuCo= nsole *src, } } } else { - keycode =3D qcode_to_keycode_set1[qcode]; + if (qcode < qemu_input_map_qcode_to_atset1_len) + keycode =3D qemu_input_map_qcode_to_atset1[qcode]; if (keycode) { if (keycode & 0xff00) { ps2_put_keycode(s, keycode >> 8); @@ -799,7 +405,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuCo= nsole *src, } } } else { - keycode =3D qcode_to_keycode_set2[qcode]; + if (qcode < qemu_input_map_qcode_to_atset2_len) + keycode =3D qemu_input_map_qcode_to_atset2[qcode]; if (keycode) { if (keycode & 0xff00) { ps2_put_keycode(s, keycode >> 8); @@ -814,7 +421,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuCo= nsole *src, } } } else if (s->scancode_set =3D=3D 3) { - keycode =3D qcode_to_keycode_set3[qcode]; + if (qcode < qemu_input_map_qcode_to_atset3_len) + keycode =3D qemu_input_map_qcode_to_atset3[qcode]; if (keycode) { /* FIXME: break code should be configured on a key by key basi= s */ if (!key->down) { diff --git a/include/ui/input.h b/include/ui/input.h index 6f56d868c7..76235ba97a 100644 --- a/include/ui/input.h +++ b/include/ui/input.h @@ -71,6 +71,15 @@ void qemu_remove_mouse_mode_change_notifier(Notifier *no= tify); extern const guint qemu_input_map_linux_to_qcode_len; extern const guint16 qemu_input_map_linux_to_qcode[]; =20 +extern const guint qemu_input_map_qcode_to_atset1_len; +extern const guint16 qemu_input_map_qcode_to_atset1[]; + +extern const guint qemu_input_map_qcode_to_atset2_len; +extern const guint16 qemu_input_map_qcode_to_atset2[]; + +extern const guint qemu_input_map_qcode_to_atset3_len; +extern const guint16 qemu_input_map_qcode_to_atset3[]; + extern const guint qemu_input_map_qcode_to_linux_len; extern const guint16 qemu_input_map_qcode_to_linux[]; =20 diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 6e543d651f..d90f6a16f7 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -6,6 +6,9 @@ #include "standard-headers/linux/input.h" =20 #include "ui/input-keymap-linux-to-qcode.c" +#include "ui/input-keymap-qcode-to-atset1.c" +#include "ui/input-keymap-qcode-to-atset2.c" +#include "ui/input-keymap-qcode-to-atset3.c" #include "ui/input-keymap-qcode-to-linux.c" #include "ui/input-keymap-qcode-to-qnum.c" #include "ui/input-keymap-qnum-to-qcode.c" --=20 2.14.3 From nobody Fri May 3 05:30:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513088326699982.7496591689866; Tue, 12 Dec 2017 06:18:46 -0800 (PST) Received: from localhost ([::1]:58594 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOlOM-00031B-4F for importer@patchew.org; Tue, 12 Dec 2017 09:18:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOlH2-0002o4-N2 for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOlGy-0001Yn-EE for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48016) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eOlGy-0001We-5D for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:04 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 35E924B72; Tue, 12 Dec 2017 14:11:03 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id C19C1620D0; Tue, 12 Dec 2017 14:10:58 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 12 Dec 2017 14:10:43 +0000 Message-Id: <20171212141044.2582-4-berrange@redhat.com> In-Reply-To: <20171212141044.2582-1-berrange@redhat.com> References: <20171212141044.2582-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 12 Dec 2017 14:11:03 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 3/4] hw: convert the escc device to keycodemapdb X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Gerd Hoffmann , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Replace the qcode_to_keycode table with automatically generated tables. Missing entries in qcode_to_keycode now fixed: - Q_KEY_CODE_KP_COMMA -> 0x2d Signed-off-by: Daniel P. Berrange --- Makefile | 1 + hw/char/escc.c | 126 +++----------------------------------------------= ---- include/ui/input.h | 3 ++ ui/input-keymap.c | 1 + 4 files changed, 10 insertions(+), 121 deletions(-) diff --git a/Makefile b/Makefile index 1e4237fd2f..eaec1d0381 100644 --- a/Makefile +++ b/Makefile @@ -232,6 +232,7 @@ KEYCODEMAP_FILES =3D \ ui/input-keymap-qcode-to-atset3.c \ ui/input-keymap-qcode-to-linux.c \ ui/input-keymap-qcode-to-qnum.c \ + ui/input-keymap-qcode-to-sun.c \ ui/input-keymap-qnum-to-qcode.c \ $(NULL) =20 diff --git a/hw/char/escc.c b/hw/char/escc.c index 3ab831a6a7..449bf2fc63 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -717,126 +717,6 @@ MemoryRegion *escc_init(hwaddr base, qemu_irq irqA, q= emu_irq irqB, return &d->mmio; } =20 -static const uint8_t qcode_to_keycode[Q_KEY_CODE__MAX] =3D { - [Q_KEY_CODE_SHIFT] =3D 99, - [Q_KEY_CODE_SHIFT_R] =3D 110, - [Q_KEY_CODE_ALT] =3D 19, - [Q_KEY_CODE_ALT_R] =3D 13, - [Q_KEY_CODE_CTRL] =3D 76, - [Q_KEY_CODE_CTRL_R] =3D 76, - [Q_KEY_CODE_ESC] =3D 29, - [Q_KEY_CODE_1] =3D 30, - [Q_KEY_CODE_2] =3D 31, - [Q_KEY_CODE_3] =3D 32, - [Q_KEY_CODE_4] =3D 33, - [Q_KEY_CODE_5] =3D 34, - [Q_KEY_CODE_6] =3D 35, - [Q_KEY_CODE_7] =3D 36, - [Q_KEY_CODE_8] =3D 37, - [Q_KEY_CODE_9] =3D 38, - [Q_KEY_CODE_0] =3D 39, - [Q_KEY_CODE_MINUS] =3D 40, - [Q_KEY_CODE_EQUAL] =3D 41, - [Q_KEY_CODE_BACKSPACE] =3D 43, - [Q_KEY_CODE_TAB] =3D 53, - [Q_KEY_CODE_Q] =3D 54, - [Q_KEY_CODE_W] =3D 55, - [Q_KEY_CODE_E] =3D 56, - [Q_KEY_CODE_R] =3D 57, - [Q_KEY_CODE_T] =3D 58, - [Q_KEY_CODE_Y] =3D 59, - [Q_KEY_CODE_U] =3D 60, - [Q_KEY_CODE_I] =3D 61, - [Q_KEY_CODE_O] =3D 62, - [Q_KEY_CODE_P] =3D 63, - [Q_KEY_CODE_BRACKET_LEFT] =3D 64, - [Q_KEY_CODE_BRACKET_RIGHT] =3D 65, - [Q_KEY_CODE_RET] =3D 89, - [Q_KEY_CODE_A] =3D 77, - [Q_KEY_CODE_S] =3D 78, - [Q_KEY_CODE_D] =3D 79, - [Q_KEY_CODE_F] =3D 80, - [Q_KEY_CODE_G] =3D 81, - [Q_KEY_CODE_H] =3D 82, - [Q_KEY_CODE_J] =3D 83, - [Q_KEY_CODE_K] =3D 84, - [Q_KEY_CODE_L] =3D 85, - [Q_KEY_CODE_SEMICOLON] =3D 86, - [Q_KEY_CODE_APOSTROPHE] =3D 87, - [Q_KEY_CODE_GRAVE_ACCENT] =3D 42, - [Q_KEY_CODE_BACKSLASH] =3D 88, - [Q_KEY_CODE_Z] =3D 100, - [Q_KEY_CODE_X] =3D 101, - [Q_KEY_CODE_C] =3D 102, - [Q_KEY_CODE_V] =3D 103, - [Q_KEY_CODE_B] =3D 104, - [Q_KEY_CODE_N] =3D 105, - [Q_KEY_CODE_M] =3D 106, - [Q_KEY_CODE_COMMA] =3D 107, - [Q_KEY_CODE_DOT] =3D 108, - [Q_KEY_CODE_SLASH] =3D 109, - [Q_KEY_CODE_ASTERISK] =3D 47, - [Q_KEY_CODE_SPC] =3D 121, - [Q_KEY_CODE_CAPS_LOCK] =3D 119, - [Q_KEY_CODE_F1] =3D 5, - [Q_KEY_CODE_F2] =3D 6, - [Q_KEY_CODE_F3] =3D 8, - [Q_KEY_CODE_F4] =3D 10, - [Q_KEY_CODE_F5] =3D 12, - [Q_KEY_CODE_F6] =3D 14, - [Q_KEY_CODE_F7] =3D 16, - [Q_KEY_CODE_F8] =3D 17, - [Q_KEY_CODE_F9] =3D 18, - [Q_KEY_CODE_F10] =3D 7, - [Q_KEY_CODE_NUM_LOCK] =3D 98, - [Q_KEY_CODE_SCROLL_LOCK] =3D 23, - [Q_KEY_CODE_KP_DIVIDE] =3D 46, - [Q_KEY_CODE_KP_MULTIPLY] =3D 47, - [Q_KEY_CODE_KP_SUBTRACT] =3D 71, - [Q_KEY_CODE_KP_ADD] =3D 125, - [Q_KEY_CODE_KP_ENTER] =3D 90, - [Q_KEY_CODE_KP_DECIMAL] =3D 50, - [Q_KEY_CODE_KP_0] =3D 94, - [Q_KEY_CODE_KP_1] =3D 112, - [Q_KEY_CODE_KP_2] =3D 113, - [Q_KEY_CODE_KP_3] =3D 114, - [Q_KEY_CODE_KP_4] =3D 91, - [Q_KEY_CODE_KP_5] =3D 92, - [Q_KEY_CODE_KP_6] =3D 93, - [Q_KEY_CODE_KP_7] =3D 68, - [Q_KEY_CODE_KP_8] =3D 69, - [Q_KEY_CODE_KP_9] =3D 70, - [Q_KEY_CODE_LESS] =3D 124, - [Q_KEY_CODE_F11] =3D 9, - [Q_KEY_CODE_F12] =3D 11, - [Q_KEY_CODE_HOME] =3D 52, - [Q_KEY_CODE_PGUP] =3D 96, - [Q_KEY_CODE_PGDN] =3D 123, - [Q_KEY_CODE_END] =3D 74, - [Q_KEY_CODE_LEFT] =3D 24, - [Q_KEY_CODE_UP] =3D 20, - [Q_KEY_CODE_DOWN] =3D 27, - [Q_KEY_CODE_RIGHT] =3D 28, - [Q_KEY_CODE_INSERT] =3D 44, - [Q_KEY_CODE_DELETE] =3D 66, - [Q_KEY_CODE_STOP] =3D 1, - [Q_KEY_CODE_AGAIN] =3D 3, - [Q_KEY_CODE_PROPS] =3D 25, - [Q_KEY_CODE_UNDO] =3D 26, - [Q_KEY_CODE_FRONT] =3D 49, - [Q_KEY_CODE_COPY] =3D 51, - [Q_KEY_CODE_OPEN] =3D 72, - [Q_KEY_CODE_PASTE] =3D 73, - [Q_KEY_CODE_FIND] =3D 95, - [Q_KEY_CODE_CUT] =3D 97, - [Q_KEY_CODE_LF] =3D 111, - [Q_KEY_CODE_HELP] =3D 118, - [Q_KEY_CODE_META_L] =3D 120, - [Q_KEY_CODE_META_R] =3D 122, - [Q_KEY_CODE_COMPOSE] =3D 67, - [Q_KEY_CODE_PRINT] =3D 22, - [Q_KEY_CODE_SYSRQ] =3D 21, -}; =20 static void sunkbd_handle_event(DeviceState *dev, QemuConsole *src, InputEvent *evt) @@ -879,7 +759,11 @@ static void sunkbd_handle_event(DeviceState *dev, Qemu= Console *src, } } =20 - keycode =3D qcode_to_keycode[qcode]; + if (qcode > qemu_input_map_qcode_to_sun_len) { + return; + } + + keycode =3D qemu_input_map_qcode_to_sun[qcode]; if (!key->down) { keycode |=3D 0x80; } diff --git a/include/ui/input.h b/include/ui/input.h index 76235ba97a..bf3d0d1060 100644 --- a/include/ui/input.h +++ b/include/ui/input.h @@ -86,6 +86,9 @@ extern const guint16 qemu_input_map_qcode_to_linux[]; extern const guint qemu_input_map_qcode_to_qnum_len; extern const guint16 qemu_input_map_qcode_to_qnum[]; =20 +extern const guint qemu_input_map_qcode_to_sun_len; +extern const guint16 qemu_input_map_qcode_to_sun[]; + extern const guint qemu_input_map_qnum_to_qcode_len; extern const guint16 qemu_input_map_qnum_to_qcode[]; =20 diff --git a/ui/input-keymap.c b/ui/input-keymap.c index d90f6a16f7..1f60caf314 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -11,6 +11,7 @@ #include "ui/input-keymap-qcode-to-atset3.c" #include "ui/input-keymap-qcode-to-linux.c" #include "ui/input-keymap-qcode-to-qnum.c" +#include "ui/input-keymap-qcode-to-sun.c" #include "ui/input-keymap-qnum-to-qcode.c" =20 int qemu_input_linux_to_qcode(unsigned int lnx) --=20 2.14.3 From nobody Fri May 3 05:30:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513088007401230.95121956913124; Tue, 12 Dec 2017 06:13:27 -0800 (PST) Received: from localhost ([::1]:58553 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOlJ3-0005BJ-Pa for importer@patchew.org; Tue, 12 Dec 2017 09:13:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOlHE-0002y9-8r for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOlH8-0001n2-NZ for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33410) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eOlH8-0001lv-Em for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:14 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6466961488; Tue, 12 Dec 2017 14:11:13 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6713B620D0; Tue, 12 Dec 2017 14:11:03 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 12 Dec 2017 14:10:44 +0000 Message-Id: <20171212141044.2582-5-berrange@redhat.com> In-Reply-To: <20171212141044.2582-1-berrange@redhat.com> References: <20171212141044.2582-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 12 Dec 2017 14:11:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 4/4] hw: convert XenInput keyboard to keycodemapdb X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Gerd Hoffmann , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Replace the scancode2linux table with an automatically generated table. In doing so, the XenFB keyboard handler is also converted to the modern InputEvent framework. Signed-off-by: Daniel P. Berrange --- hw/display/xenfb.c | 138 +++++++++++++------------------------------------= ---- 1 file changed, 33 insertions(+), 105 deletions(-) diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 8e2547ac05..407b6d04e9 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -28,6 +28,7 @@ =20 #include "hw/hw.h" #include "ui/console.h" +#include "ui/input.h" #include "hw/xen/xen_backend.h" =20 #include @@ -52,7 +53,7 @@ struct XenInput { struct common c; int abs_pointer_wanted; /* Whether guest supports absolute pointer */ int button_state; /* Last seen pointer button state */ - int extended; + QemuInputHandlerState *qkbd; QEMUPutMouseEntry *qmouse; }; =20 @@ -120,78 +121,6 @@ static void common_unbind(struct common *c) =20 /* -------------------------------------------------------------------- */ =20 -#if 0 -/* - * These two tables are not needed any more, but left in here - * intentionally as documentation, to show how scancode2linux[] - * was generated. - * - * Tables to map from scancode to Linux input layer keycode. - * Scancodes are hardware-specific. These maps assumes a - * standard AT or PS/2 keyboard which is what QEMU feeds us. - */ -const unsigned char atkbd_set2_keycode[512] =3D { - - 0, 67, 65, 63, 61, 59, 60, 88, 0, 68, 66, 64, 62, 15, 41,117, - 0, 56, 42, 93, 29, 16, 2, 0, 0, 0, 44, 31, 30, 17, 3, 0, - 0, 46, 45, 32, 18, 5, 4, 95, 0, 57, 47, 33, 20, 19, 6,183, - 0, 49, 48, 35, 34, 21, 7,184, 0, 0, 50, 36, 22, 8, 9,185, - 0, 51, 37, 23, 24, 11, 10, 0, 0, 52, 53, 38, 39, 25, 12, 0, - 0, 89, 40, 0, 26, 13, 0, 0, 58, 54, 28, 27, 0, 43, 0, 85, - 0, 86, 91, 90, 92, 0, 14, 94, 0, 79,124, 75, 71,121, 0, 0, - 82, 83, 80, 76, 77, 72, 1, 69, 87, 78, 81, 74, 55, 73, 70, 99, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 217,100,255, 0, 97,165, 0, 0,156, 0, 0, 0, 0, 0, 0,125, - 173,114, 0,113, 0, 0, 0,126,128, 0, 0,140, 0, 0, 0,127, - 159, 0,115, 0,164, 0, 0,116,158, 0,150,166, 0, 0, 0,142, - 157, 0, 0, 0, 0, 0, 0, 0,155, 0, 98, 0, 0,163, 0, 0, - 226, 0, 0, 0, 0, 0, 0, 0, 0,255, 96, 0, 0, 0,143, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,107, 0,105,102, 0, 0,112, - 110,111,108,112,106,103, 0,119, 0,118,109, 0, 99,104,119, 0, - -}; - -const unsigned char atkbd_unxlate_table[128] =3D { - - 0,118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85,102, 13, - 21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 28, 27, - 35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 33, 42, - 50, 49, 58, 65, 73, 74, 89,124, 17, 41, 88, 5, 6, 4, 12, 3, - 11, 2, 10, 1, 9,119,126,108,117,125,123,107,115,116,121,105, - 114,122,112,113,127, 96, 97,120, 7, 15, 23, 31, 39, 47, 55, 63, - 71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87,111, - 19, 25, 57, 81, 83, 92, 95, 98, 99,100,101,103,104,106,109,110 - -}; -#endif - -/* - * for (i =3D 0; i < 128; i++) { - * scancode2linux[i] =3D atkbd_set2_keycode[atkbd_unxlate_table[i]]; - * scancode2linux[i | 0x80] =3D atkbd_set2_keycode[atkbd_unxlate_table= [i] | 0x80]; - * } - */ -static const unsigned char scancode2linux[512] =3D { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 99, 0, 86, 87, 88,117, 0, 0, 95,183,184,185, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 93, 0, 0, 89, 0, 0, 85, 91, 90, 92, 0, 94, 0,124,121, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 165, 0, 0, 0, 0, 0, 0, 0, 0,163, 0, 0, 96, 97, 0, 0, - 113,140,164, 0,166, 0, 0, 0, 0, 0,255, 0, 0, 0,114, 0, - 115, 0,150, 0, 0, 98,255, 99,100, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,119,119,102,103,104, 0,105,112,106,118,107, - 108,109,110,111, 0, 0, 0, 0, 0, 0, 0,125,126,127,116,142, - 0, 0, 0,143, 0,217,156,173,128,159,158,157,155,226, 0,112, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -}; - /* Send an event to the keyboard frontend driver */ static int xenfb_kbd_event(struct XenInput *xenfb, union xenkbd_in_event *event) @@ -260,38 +189,23 @@ static int xenfb_send_position(struct XenInput *xenfb, return xenfb_kbd_event(xenfb, &event); } =20 -/* - * Send a key event from the client to the guest OS - * QEMU gives us a raw scancode from an AT / PS/2 style keyboard. - * We have to turn this into a Linux Input layer keycode. - * - * Extra complexity from the fact that with extended scancodes - * (like those produced by arrow keys) this method gets called - * twice, but we only want to send a single event. So we have to - * track the '0xe0' scancode state & collapse the extended keys - * as needed. - * - * Wish we could just send scancodes straight to the guest which - * already has code for dealing with this... - */ -static void xenfb_key_event(void *opaque, int scancode) +static void xenfb_key_event(DeviceState *dev, QemuConsole *src, + InputEvent *evt) { - struct XenInput *xenfb =3D opaque; - int down =3D 1; - - if (scancode =3D=3D 0xe0) { - xenfb->extended =3D 1; - return; - } else if (scancode & 0x80) { - scancode &=3D 0x7f; - down =3D 0; - } - if (xenfb->extended) { - scancode |=3D 0x80; - xenfb->extended =3D 0; + struct XenInput *xenfb =3D container_of(dev, struct XenInput, + c.xendev.qdev); + InputKeyEvent *key =3D evt->u.key.data; + int qcode; + + assert(evt->type =3D=3D INPUT_EVENT_KIND_KEY); + + qcode =3D qemu_input_key_value_to_qcode(key->key); + if (qcode < qemu_input_map_qcode_to_linux_len) { + trace_xenfb_key_event(xenfb, qemu_input_map_qcode_to_linux[qcode], + key->down); + xenfb_send_key(xenfb, key->down, + qemu_input_map_qcode_to_linux[qcode]); } - trace_xenfb_key_event(opaque, scancode2linux[scancode], down); - xenfb_send_key(xenfb, down, scancode2linux[scancode]); } =20 /* @@ -348,6 +262,12 @@ static int input_init(struct XenDevice *xendev) return 0; } =20 +static QemuInputHandler xenfb_keyboard_handler =3D { + .name =3D "Xen FB Keyboard", + .mask =3D INPUT_EVENT_MASK_KEY, + .event =3D xenfb_key_event, +}; + static int input_initialise(struct XenDevice *xendev) { struct XenInput *in =3D container_of(xendev, struct XenInput, c.xendev= ); @@ -357,7 +277,6 @@ static int input_initialise(struct XenDevice *xendev) if (rc !=3D 0) return rc; =20 - qemu_add_kbd_event_handler(xenfb_key_event, in); return 0; } =20 @@ -377,6 +296,12 @@ static void input_connected(struct XenDevice *xendev) in->qmouse =3D qemu_add_mouse_event_handler(xenfb_mouse_event, in, in->abs_pointer_wanted, "Xen PVFB Mouse"); + + if (in->qkbd) { + qemu_input_handler_unregister(in->qkbd); + } + in->qkbd =3D qemu_input_handler_register((DeviceState *)in, + &xenfb_keyboard_handler); } =20 static void input_disconnect(struct XenDevice *xendev) @@ -387,7 +312,10 @@ static void input_disconnect(struct XenDevice *xendev) qemu_remove_mouse_event_handler(in->qmouse); in->qmouse =3D NULL; } - qemu_add_kbd_event_handler(NULL, NULL); + if (in->qkbd) { + qemu_input_handler_unregister(in->qkbd); + in->qkbd =3D NULL; + } common_unbind(&in->c); } =20 --=20 2.14.3