mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw: convert virtio-input-hid device to keycodemapdb

Browse Source 
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 conceivably
read the old size field, but then get the newly updated bitmap.  If a key were
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 entire
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 <berrange@redhat.com>
Message-id: 20180117164118.8510-5-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Daniel P. Berrange 2018-01-17 16:41:18 +00:00 committed by Gerd Hoffmann
parent 5a15e6b1ca
commit ae6b06ab65
1 changed files with 9 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
hw/input/virtio-input-hid.c
View File

@ -22,126 +22,7 @@
/* ----------------------------------------------------------------- */
static const unsigned int keymap_qcode[Q_KEY_CODE__MAX] = {
[Q_KEY_CODE_ESC] = KEY_ESC,
[Q_KEY_CODE_1] = KEY_1,
[Q_KEY_CODE_2] = KEY_2,
[Q_KEY_CODE_3] = KEY_3,
[Q_KEY_CODE_4] = KEY_4,
[Q_KEY_CODE_5] = KEY_5,
[Q_KEY_CODE_6] = KEY_6,
[Q_KEY_CODE_7] = KEY_7,
[Q_KEY_CODE_8] = KEY_8,
[Q_KEY_CODE_9] = KEY_9,
[Q_KEY_CODE_0] = KEY_0,
[Q_KEY_CODE_MINUS] = KEY_MINUS,
[Q_KEY_CODE_EQUAL] = KEY_EQUAL,
[Q_KEY_CODE_BACKSPACE] = KEY_BACKSPACE,
[Q_KEY_CODE_TAB] = KEY_TAB,
[Q_KEY_CODE_Q] = KEY_Q,
[Q_KEY_CODE_W] = KEY_W,
[Q_KEY_CODE_E] = KEY_E,
[Q_KEY_CODE_R] = KEY_R,
[Q_KEY_CODE_T] = KEY_T,
[Q_KEY_CODE_Y] = KEY_Y,
[Q_KEY_CODE_U] = KEY_U,
[Q_KEY_CODE_I] = KEY_I,
[Q_KEY_CODE_O] = KEY_O,
[Q_KEY_CODE_P] = KEY_P,
[Q_KEY_CODE_BRACKET_LEFT] = KEY_LEFTBRACE,
[Q_KEY_CODE_BRACKET_RIGHT] = KEY_RIGHTBRACE,
[Q_KEY_CODE_RET] = KEY_ENTER,
[Q_KEY_CODE_CTRL] = KEY_LEFTCTRL,
[Q_KEY_CODE_A] = KEY_A,
[Q_KEY_CODE_S] = KEY_S,
[Q_KEY_CODE_D] = KEY_D,
[Q_KEY_CODE_F] = KEY_F,
[Q_KEY_CODE_G] = KEY_G,
[Q_KEY_CODE_H] = KEY_H,
[Q_KEY_CODE_J] = KEY_J,
[Q_KEY_CODE_K] = KEY_K,
[Q_KEY_CODE_L] = KEY_L,
[Q_KEY_CODE_SEMICOLON] = KEY_SEMICOLON,
[Q_KEY_CODE_APOSTROPHE] = KEY_APOSTROPHE,
[Q_KEY_CODE_GRAVE_ACCENT] = KEY_GRAVE,
[Q_KEY_CODE_SHIFT] = KEY_LEFTSHIFT,
[Q_KEY_CODE_BACKSLASH] = KEY_BACKSLASH,
[Q_KEY_CODE_LESS] = KEY_102ND,
[Q_KEY_CODE_Z] = KEY_Z,
[Q_KEY_CODE_X] = KEY_X,
[Q_KEY_CODE_C] = KEY_C,
[Q_KEY_CODE_V] = KEY_V,
[Q_KEY_CODE_B] = KEY_B,
[Q_KEY_CODE_N] = KEY_N,
[Q_KEY_CODE_M] = KEY_M,
[Q_KEY_CODE_COMMA] = KEY_COMMA,
[Q_KEY_CODE_DOT] = KEY_DOT,
[Q_KEY_CODE_SLASH] = KEY_SLASH,
[Q_KEY_CODE_SHIFT_R] = KEY_RIGHTSHIFT,
[Q_KEY_CODE_ALT] = KEY_LEFTALT,
[Q_KEY_CODE_SPC] = KEY_SPACE,
[Q_KEY_CODE_CAPS_LOCK] = KEY_CAPSLOCK,
[Q_KEY_CODE_F1] = KEY_F1,
[Q_KEY_CODE_F2] = KEY_F2,
[Q_KEY_CODE_F3] = KEY_F3,
[Q_KEY_CODE_F4] = KEY_F4,
[Q_KEY_CODE_F5] = KEY_F5,
[Q_KEY_CODE_F6] = KEY_F6,
[Q_KEY_CODE_F7] = KEY_F7,
[Q_KEY_CODE_F8] = KEY_F8,
[Q_KEY_CODE_F9] = KEY_F9,
[Q_KEY_CODE_F10] = KEY_F10,
[Q_KEY_CODE_NUM_LOCK] = KEY_NUMLOCK,
[Q_KEY_CODE_SCROLL_LOCK] = KEY_SCROLLLOCK,
[Q_KEY_CODE_KP_0] = KEY_KP0,
[Q_KEY_CODE_KP_1] = KEY_KP1,
[Q_KEY_CODE_KP_2] = KEY_KP2,
[Q_KEY_CODE_KP_3] = KEY_KP3,
[Q_KEY_CODE_KP_4] = KEY_KP4,
[Q_KEY_CODE_KP_5] = KEY_KP5,
[Q_KEY_CODE_KP_6] = KEY_KP6,
[Q_KEY_CODE_KP_7] = KEY_KP7,
[Q_KEY_CODE_KP_8] = KEY_KP8,
[Q_KEY_CODE_KP_9] = KEY_KP9,
[Q_KEY_CODE_KP_SUBTRACT] = KEY_KPMINUS,
[Q_KEY_CODE_KP_ADD] = KEY_KPPLUS,
[Q_KEY_CODE_KP_DECIMAL] = KEY_KPDOT,
[Q_KEY_CODE_KP_ENTER] = KEY_KPENTER,
[Q_KEY_CODE_KP_DIVIDE] = KEY_KPSLASH,
[Q_KEY_CODE_KP_MULTIPLY] = KEY_KPASTERISK,
[Q_KEY_CODE_F11] = KEY_F11,
[Q_KEY_CODE_F12] = KEY_F12,
[Q_KEY_CODE_CTRL_R] = KEY_RIGHTCTRL,
[Q_KEY_CODE_SYSRQ] = KEY_SYSRQ,
[Q_KEY_CODE_PRINT] = KEY_SYSRQ,
[Q_KEY_CODE_PAUSE] = KEY_PAUSE,
[Q_KEY_CODE_ALT_R] = KEY_RIGHTALT,
[Q_KEY_CODE_HOME] = KEY_HOME,
[Q_KEY_CODE_UP] = KEY_UP,
[Q_KEY_CODE_PGUP] = KEY_PAGEUP,
[Q_KEY_CODE_LEFT] = KEY_LEFT,
[Q_KEY_CODE_RIGHT] = KEY_RIGHT,
[Q_KEY_CODE_END] = KEY_END,
[Q_KEY_CODE_DOWN] = KEY_DOWN,
[Q_KEY_CODE_PGDN] = KEY_PAGEDOWN,
[Q_KEY_CODE_INSERT] = KEY_INSERT,
[Q_KEY_CODE_DELETE] = KEY_DELETE,
[Q_KEY_CODE_META_L] = KEY_LEFTMETA,
[Q_KEY_CODE_META_R] = KEY_RIGHTMETA,
[Q_KEY_CODE_MENU] = KEY_MENU,
};
static const unsigned int keymap_button[INPUT_BUTTON__MAX] = {
static const unsigned short keymap_button[INPUT_BUTTON__MAX] = {
[INPUT_BUTTON_LEFT] = BTN_LEFT,
[INPUT_BUTTON_RIGHT] = BTN_RIGHT,
[INPUT_BUTTON_MIDDLE] = BTN_MIDDLE,
@ -151,12 +32,12 @@ static const unsigned int keymap_button[INPUT_BUTTON__MAX] = {
[INPUT_BUTTON_EXTRA] = BTN_EXTRA,
};
static const unsigned int axismap_rel[INPUT_AXIS__MAX] = {
static const unsigned short axismap_rel[INPUT_AXIS__MAX] = {
[INPUT_AXIS_X] = REL_X,
[INPUT_AXIS_Y] = REL_Y,
};
static const unsigned int axismap_abs[INPUT_AXIS__MAX] = {
static const unsigned short axismap_abs[INPUT_AXIS__MAX] = {
[INPUT_AXIS_X] = ABS_X,
[INPUT_AXIS_Y] = ABS_Y,
};
@ -164,7 +45,7 @@ static const unsigned int axismap_abs[INPUT_AXIS__MAX] = {
/* ----------------------------------------------------------------- */
static void virtio_input_key_config(VirtIOInput *vinput,
const unsigned int *keymap,
const unsigned short *keymap,
size_t mapsize)
{
virtio_input_config keys;
@ -204,9 +85,10 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src,
case INPUT_EVENT_KIND_KEY:
key = evt->u.key.data;
qcode = 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 = cpu_to_le16(EV_KEY);
event.code = cpu_to_le16(keymap_qcode[qcode]);
event.code = cpu_to_le16(qemu_input_map_qcode_to_linux[qcode]);
event.value = cpu_to_le32(key->down ? 1 : 0);
virtio_input_send(vinput, &event);
} else {
@ -399,8 +281,8 @@ static void virtio_keyboard_init(Object *obj)
vhid->handler = &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);
}
static const TypeInfo virtio_keyboard_info = {