* [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
@ 2017-08-10 15:55 Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 01/15] ui: add keycodemapdb repository as a GIT submodule Daniel P. Berrange
` (19 more replies)
0 siblings, 20 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
The keycodemap project[1] provides a database mapping between
many different keysym/keycode/scancode sets, along with a
tool to generate mapping/lookup tables in various programming
languages. It is already used by GTK-VNC, SPICE-GTK and
libvirt.
This series enables its use in QEMU, thus fixing a great
many bugs/ommissions in the 15+ key mapping tables people
have manually written for QEMU.
The keycodemapdb code is designed to be used as a git
sub-module, it is not an external dependancy you need
installed before use.
This series converts all the front ends and all the input
devices which are using the new InputEvent framework. A
handful of devices still use the legacy kbd handler
$ git grep -l add_kbd_event_handler hw
hw/arm/musicpal.c
hw/arm/nseries.c
hw/arm/palm.c
hw/arm/spitz.c
hw/input/pxa2xx_keypad.c
hw/input/stellaris_input.c
and could be usefully converted too.
I've not done much realworld testing of this yet. I did
however write code that compared the mapping tables before
and after conversion to identify what mapping changes have
resulted in each frontend/backend. What I still need to
go back and validate is the Print/Sysrq handling, because
that is special everywhere and I'm not entirely sure I've
done that correctly yet. The GTK frontend should now work
correctly when run on X11 servers on Win32 and OS-X, as
well as when run on native Win32/OS-X display backends.
[1] https://gitlab.com/keycodemap/keycodemapdb/
Daniel P. Berrange (15):
ui: add keycodemapdb repository as a GIT submodule
ui: convert common input code to keycodemapdb
ui: convert key events to QKeyCodes immediately
ui: don't export qemu_input_event_new_key
ui: use QKeyCode exclusively in InputKeyEvent
input: convert virtio-input-hid device to keycodemapdb
input: convert ps2 device to keycodemapdb
input: convert the adb device to keycodemapdb
char: convert the escc device to keycodemapdb
ui: convert cocoa frontend to keycodemapdb
ui: convert the SDL2 frontend to keycodemapdb
ui: convert GTK and SDL1 frontends to keycodemapdb
ui: remove qemu_input_qcode_to_number method
ui: remove qemu_input_linux_to_qcode method
display: convert XenInput keyboard to keycodemapdb
.gitignore | 2 +
.gitmodules | 3 +
hw/char/escc.c | 128 +-------------
hw/display/xenfb.c | 131 +++-----------
hw/input/adb.c | 126 +-------------
hw/input/hid.c | 6 +-
hw/input/ps2.c | 408 +-------------------------------------------
hw/input/virtio-input-hid.c | 138 ++-------------
include/hw/input/adb-keys.h | 141 ---------------
include/ui/input.h | 64 ++++++-
qapi-schema.json | 2 +-
replay/replay-input.c | 36 +---
ui/Makefile.objs | 41 ++++-
ui/cocoa.m | 129 +-------------
ui/gtk.c | 205 +++++++++++++---------
ui/input-keymap.c | 369 ++++-----------------------------------
ui/input-legacy.c | 31 ++--
ui/input-linux.c | 4 +-
ui/input.c | 49 ++----
ui/keycodemapdb | 1 +
ui/sdl.c | 103 ++++-------
ui/sdl2-input.c | 14 +-
ui/sdl2-keymap.h | 267 -----------------------------
ui/trace-events | 10 +-
ui/x_keymap.c | 247 ++++++++++-----------------
ui/x_keymap.h | 8 +-
26 files changed, 495 insertions(+), 2168 deletions(-)
delete mode 100644 include/hw/input/adb-keys.h
create mode 160000 ui/keycodemapdb
delete mode 100644 ui/sdl2-keymap.h
--
2.13.3
^ permalink raw reply [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 01/15] ui: add keycodemapdb repository as a GIT submodule
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 18:23 ` Eric Blake
2017-08-10 15:55 ` [Qemu-devel] [PATCH 02/15] ui: convert common input code to keycodemapdb Daniel P. Berrange
` (18 subsequent siblings)
19 siblings, 1 reply; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
The https://gitlab.com/keycodemap/keycodemapdb/ repo contains a
data file mapping between all the different scancode/keycode/keysym
sets that are known, and a tool to auto-generate lookup tables for
different combinations.
It is used by GTK-VNC, SPICE-GTK and libvirt for mapping keys.
Using it in QEMU will let us replace many hand written lookup
tables with auto-generated tables from a master data source,
reducing bugs. Adding new QKeyCodes will now only require the
master table to be updated, all ~20 other tables will be
automatically updated to follow.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
.gitignore | 2 ++
.gitmodules | 3 +++
ui/Makefile.objs | 18 ++++++++++++++++++
ui/keycodemapdb | 1 +
4 files changed, 24 insertions(+)
create mode 160000 ui/keycodemapdb
diff --git a/.gitignore b/.gitignore
index cf65316863..6e5a1202c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,8 @@
/trace/generated-tcg-tracers.h
/ui/shader/texture-blit-frag.h
/ui/shader/texture-blit-vert.h
+/ui/keycodemap_*.c
+/ui/input-keymap-*.c
*-timestamp
/*-softmmu
/*-darwin-user
diff --git a/.gitmodules b/.gitmodules
index 5b0c212622..369989f19e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,3 +37,6 @@
[submodule "roms/QemuMacDrivers"]
path = roms/QemuMacDrivers
url = git://git.qemu.org/QemuMacDrivers.git
+[submodule "ui/keycodemapdb"]
+ path = ui/keycodemapdb
+ url = https://gitlab.com/keycodemap/keycodemapdb.git
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 3369451285..d94d1ca183 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -49,3 +49,21 @@ gtk-egl.o-libs += $(OPENGL_LIBS)
shader.o-libs += $(OPENGL_LIBS)
console-gl.o-libs += $(OPENGL_LIBS)
egl-helpers.o-libs += $(OPENGL_LIBS)
+
+KEYCODEMAP_GEN = ui/keycodemapdb/tools/keymap-gen
+KEYCODEMAP_CSV = ui/keycodemapdb/data/keymaps.csv
+
+KEYCODEMAP_FILES = \
+ $(NULL)
+
+GENERATED_FILES += $(KEYCODEMAP_FILES)
+
+ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) ui/Makefile.objs
+ $(call quiet-command,\
+ $(PYTHON) $(KEYCODEMAP_GEN) \
+ --lang glib2 \
+ --varname qemu_input_map_$$(echo $@ | sed -e "s,^ui/input-keymap-,," -e "s,\.c$$,,") \
+ code-map $(KEYCODEMAP_CSV) \
+ $$(echo $@ | sed -E -e "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\1,") \
+ $$(echo $@ | sed -E -e "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\2,") \
+ > $@ || rm $@, "GEN", "$@")
diff --git a/ui/keycodemapdb b/ui/keycodemapdb
new file mode 160000
index 0000000000..aed87bb2aa
--- /dev/null
+++ b/ui/keycodemapdb
@@ -0,0 +1 @@
+Subproject commit aed87bb2aa6ed83b49574eb982e3bdd4c36acf17
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 02/15] ui: convert common input code to keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 01/15] ui: add keycodemapdb repository as a GIT submodule Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 18:59 ` Eric Blake
2017-08-10 15:55 ` [Qemu-devel] [PATCH 03/15] ui: convert key events to QKeyCodes immediately Daniel P. Berrange
` (17 subsequent siblings)
19 siblings, 1 reply; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
Replace the number_to_qcode, qcode_to_number and linux_to_qcode
tables with automatically generated tables.
Missing entries in linux_to_qcode now fixed:
KEY_LINEFEED -> Q_KEY_CODE_LF
KEY_KPEQUAL -> Q_KEY_CODE_KP_EQUALS
KEY_COMPOSE -> Q_KEY_CODE_COMPOSE
KEY_AGAIN -> Q_KEY_CODE_AGAIN
KEY_PROPS -> Q_KEY_CODE_PROPS
KEY_UNDO -> Q_KEY_CODE_UNDO
KEY_FRONT -> Q_KEY_CODE_FRONT
KEY_COPY -> Q_KEY_CODE_COPY
KEY_OPEN -> Q_KEY_CODE_OPEN
KEY_PASTE -> Q_KEY_CODE_PASTE
KEY_CUT -> Q_KEY_CODE_CUT
KEY_HELP -> Q_KEY_CODE_HELP
KEY_MEDIA -> Q_KEY_CODE_MEDIASELECT
In additionsome fixes:
- KEY_PLAYPAUSE now maps to Q_KEY_CODE_AUDIOPLAY, instead of
KEY_PLAYCD. KEY_PLAYPAUSE is defined across almost all scancodes
sets, while KEY_PLAYCD only appears in AT set1, so the former is
a more useful mapping.
Missing entries in qcode_to_number now fixed:
Q_KEY_CODE_AGAIN -> 0x85
Q_KEY_CODE_PROPS -> 0x86
Q_KEY_CODE_UNDO -> 0x87
Q_KEY_CODE_FRONT -> 0x8c
Q_KEY_CODE_COPY -> 0xf8
Q_KEY_CODE_OPEN -> 0x64
Q_KEY_CODE_PASTE -> 0x65
Q_KEY_CODE_CUT -> 0xbc
Q_KEY_CODE_LF -> 0x5b
Q_KEY_CODE_HELP -> 0xf5
Q_KEY_CODE_COMPOSE -> 0xdd
Q_KEY_CODE_KP_EQUALS -> 0x59
Q_KEY_CODE_MEDIASELECT -> 0xed
In addition some fixes:
- Q_KEY_CODE_MENU was incorrectly mapped to the compose
scancode (0xdd) and is now mapped to 0x9e
- Q_KEY_CODE_FIND was mapped to 0xe065 (Search) instead
of to 0xe041 (Find)
- Q_KEY_CODE_HIRAGANA was mapped to 0x70 (Katakanahiragana)
instead of of 0x77 (Hirigana)
- Q_KEY_CODE_PRINT was mapped to 0xb7 which is not a defined
scan code in AT set 1, it is now mapped to 0x54 (sysrq)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
include/ui/input.h | 11 +-
ui/Makefile.objs | 3 +
ui/input-keymap.c | 326 +++--------------------------------------------------
3 files changed, 28 insertions(+), 312 deletions(-)
diff --git a/include/ui/input.h b/include/ui/input.h
index c488585def..1e1cfa0fdf 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -43,7 +43,7 @@ void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down);
void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down);
void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down);
void qemu_input_event_send_key_delay(uint32_t delay_ms);
-int qemu_input_key_number_to_qcode(uint8_t nr);
+int qemu_input_key_number_to_qcode(unsigned int nr);
int qemu_input_key_value_to_number(const KeyValue *value);
int qemu_input_key_value_to_qcode(const KeyValue *value);
int qemu_input_key_value_to_scancode(const KeyValue *value, bool down,
@@ -69,4 +69,13 @@ void qemu_input_check_mode_change(void);
void qemu_add_mouse_mode_change_notifier(Notifier *notify);
void qemu_remove_mouse_mode_change_notifier(Notifier *notify);
+extern const guint qemu_input_map_linux2qcode_len;
+extern const guint16 qemu_input_map_linux2qcode[];
+
+extern const guint qemu_input_map_qcode2qnum_len;
+extern const guint16 qemu_input_map_qcode2qnum[];
+
+extern const guint qemu_input_map_qnum2qcode_len;
+extern const guint16 qemu_input_map_qnum2qcode[];
+
#endif /* INPUT_H */
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index d94d1ca183..964fabdd3a 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -54,6 +54,9 @@ KEYCODEMAP_GEN = ui/keycodemapdb/tools/keymap-gen
KEYCODEMAP_CSV = ui/keycodemapdb/data/keymaps.csv
KEYCODEMAP_FILES = \
+ ui/input-keymap-linux2qcode.c \
+ ui/input-keymap-qcode2qnum.c \
+ ui/input-keymap-qnum2qcode.c \
$(NULL)
GENERATED_FILES += $(KEYCODEMAP_FILES)
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index cf979c2ce9..bbbb66bae7 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -5,333 +5,37 @@
#include "standard-headers/linux/input.h"
-static int linux_to_qcode[KEY_CNT] = {
- [KEY_ESC] = Q_KEY_CODE_ESC,
- [KEY_1] = Q_KEY_CODE_1,
- [KEY_2] = Q_KEY_CODE_2,
- [KEY_3] = Q_KEY_CODE_3,
- [KEY_4] = Q_KEY_CODE_4,
- [KEY_5] = Q_KEY_CODE_5,
- [KEY_6] = Q_KEY_CODE_6,
- [KEY_7] = Q_KEY_CODE_7,
- [KEY_8] = Q_KEY_CODE_8,
- [KEY_9] = Q_KEY_CODE_9,
- [KEY_0] = Q_KEY_CODE_0,
- [KEY_MINUS] = Q_KEY_CODE_MINUS,
- [KEY_EQUAL] = Q_KEY_CODE_EQUAL,
- [KEY_BACKSPACE] = Q_KEY_CODE_BACKSPACE,
- [KEY_TAB] = Q_KEY_CODE_TAB,
- [KEY_Q] = Q_KEY_CODE_Q,
- [KEY_W] = Q_KEY_CODE_W,
- [KEY_E] = Q_KEY_CODE_E,
- [KEY_R] = Q_KEY_CODE_R,
- [KEY_T] = Q_KEY_CODE_T,
- [KEY_Y] = Q_KEY_CODE_Y,
- [KEY_U] = Q_KEY_CODE_U,
- [KEY_I] = Q_KEY_CODE_I,
- [KEY_O] = Q_KEY_CODE_O,
- [KEY_P] = Q_KEY_CODE_P,
- [KEY_LEFTBRACE] = Q_KEY_CODE_BRACKET_LEFT,
- [KEY_RIGHTBRACE] = Q_KEY_CODE_BRACKET_RIGHT,
- [KEY_ENTER] = Q_KEY_CODE_RET,
- [KEY_LEFTCTRL] = Q_KEY_CODE_CTRL,
- [KEY_A] = Q_KEY_CODE_A,
- [KEY_S] = Q_KEY_CODE_S,
- [KEY_D] = Q_KEY_CODE_D,
- [KEY_F] = Q_KEY_CODE_F,
- [KEY_G] = Q_KEY_CODE_G,
- [KEY_H] = Q_KEY_CODE_H,
- [KEY_J] = Q_KEY_CODE_J,
- [KEY_K] = Q_KEY_CODE_K,
- [KEY_L] = Q_KEY_CODE_L,
- [KEY_SEMICOLON] = Q_KEY_CODE_SEMICOLON,
- [KEY_APOSTROPHE] = Q_KEY_CODE_APOSTROPHE,
- [KEY_GRAVE] = Q_KEY_CODE_GRAVE_ACCENT,
- [KEY_LEFTSHIFT] = Q_KEY_CODE_SHIFT,
- [KEY_BACKSLASH] = Q_KEY_CODE_BACKSLASH,
- [KEY_102ND] = Q_KEY_CODE_LESS,
- [KEY_Z] = Q_KEY_CODE_Z,
- [KEY_X] = Q_KEY_CODE_X,
- [KEY_C] = Q_KEY_CODE_C,
- [KEY_V] = Q_KEY_CODE_V,
- [KEY_B] = Q_KEY_CODE_B,
- [KEY_N] = Q_KEY_CODE_N,
- [KEY_M] = Q_KEY_CODE_M,
- [KEY_COMMA] = Q_KEY_CODE_COMMA,
- [KEY_DOT] = Q_KEY_CODE_DOT,
- [KEY_SLASH] = Q_KEY_CODE_SLASH,
- [KEY_RIGHTSHIFT] = Q_KEY_CODE_SHIFT_R,
- [KEY_LEFTALT] = Q_KEY_CODE_ALT,
- [KEY_SPACE] = Q_KEY_CODE_SPC,
- [KEY_CAPSLOCK] = Q_KEY_CODE_CAPS_LOCK,
- [KEY_F1] = Q_KEY_CODE_F1,
- [KEY_F2] = Q_KEY_CODE_F2,
- [KEY_F3] = Q_KEY_CODE_F3,
- [KEY_F4] = Q_KEY_CODE_F4,
- [KEY_F5] = Q_KEY_CODE_F5,
- [KEY_F6] = Q_KEY_CODE_F6,
- [KEY_F7] = Q_KEY_CODE_F7,
- [KEY_F8] = Q_KEY_CODE_F8,
- [KEY_F9] = Q_KEY_CODE_F9,
- [KEY_F10] = Q_KEY_CODE_F10,
- [KEY_NUMLOCK] = Q_KEY_CODE_NUM_LOCK,
- [KEY_SCROLLLOCK] = Q_KEY_CODE_SCROLL_LOCK,
- [KEY_KP0] = Q_KEY_CODE_KP_0,
- [KEY_KP1] = Q_KEY_CODE_KP_1,
- [KEY_KP2] = Q_KEY_CODE_KP_2,
- [KEY_KP3] = Q_KEY_CODE_KP_3,
- [KEY_KP4] = Q_KEY_CODE_KP_4,
- [KEY_KP5] = Q_KEY_CODE_KP_5,
- [KEY_KP6] = Q_KEY_CODE_KP_6,
- [KEY_KP7] = Q_KEY_CODE_KP_7,
- [KEY_KP8] = Q_KEY_CODE_KP_8,
- [KEY_KP9] = Q_KEY_CODE_KP_9,
- [KEY_KPMINUS] = Q_KEY_CODE_KP_SUBTRACT,
- [KEY_KPPLUS] = Q_KEY_CODE_KP_ADD,
- [KEY_KPDOT] = Q_KEY_CODE_KP_DECIMAL,
- [KEY_KPENTER] = Q_KEY_CODE_KP_ENTER,
- [KEY_KPSLASH] = Q_KEY_CODE_KP_DIVIDE,
- [KEY_KPASTERISK] = Q_KEY_CODE_KP_MULTIPLY,
- [KEY_F11] = Q_KEY_CODE_F11,
- [KEY_F12] = Q_KEY_CODE_F12,
- [KEY_RO] = Q_KEY_CODE_RO,
- [KEY_HIRAGANA] = Q_KEY_CODE_HIRAGANA,
- [KEY_HENKAN] = Q_KEY_CODE_HENKAN,
- [KEY_RIGHTCTRL] = Q_KEY_CODE_CTRL_R,
- [KEY_SYSRQ] = Q_KEY_CODE_SYSRQ,
- [KEY_RIGHTALT] = Q_KEY_CODE_ALT_R,
- [KEY_HOME] = Q_KEY_CODE_HOME,
- [KEY_UP] = Q_KEY_CODE_UP,
- [KEY_PAGEUP] = Q_KEY_CODE_PGUP,
- [KEY_LEFT] = Q_KEY_CODE_LEFT,
- [KEY_RIGHT] = Q_KEY_CODE_RIGHT,
- [KEY_END] = Q_KEY_CODE_END,
- [KEY_DOWN] = Q_KEY_CODE_DOWN,
- [KEY_PAGEDOWN] = Q_KEY_CODE_PGDN,
- [KEY_INSERT] = Q_KEY_CODE_INSERT,
- [KEY_DELETE] = Q_KEY_CODE_DELETE,
- [KEY_POWER] = Q_KEY_CODE_POWER,
- [KEY_KPCOMMA] = Q_KEY_CODE_KP_COMMA,
- [KEY_YEN] = Q_KEY_CODE_YEN,
- [KEY_LEFTMETA] = Q_KEY_CODE_META_L,
- [KEY_RIGHTMETA] = Q_KEY_CODE_META_R,
- [KEY_MENU] = Q_KEY_CODE_MENU,
- [KEY_PAUSE] = Q_KEY_CODE_PAUSE,
-
- [KEY_SLEEP] = Q_KEY_CODE_SLEEP,
- [KEY_WAKEUP] = Q_KEY_CODE_WAKE,
- [KEY_CALC] = Q_KEY_CODE_CALCULATOR,
- [KEY_MAIL] = Q_KEY_CODE_MAIL,
- [KEY_COMPUTER] = Q_KEY_CODE_COMPUTER,
-
- [KEY_STOP] = Q_KEY_CODE_STOP,
- [KEY_BOOKMARKS] = Q_KEY_CODE_AC_BOOKMARKS,
- [KEY_BACK] = Q_KEY_CODE_AC_BACK,
- [KEY_FORWARD] = Q_KEY_CODE_AC_FORWARD,
- [KEY_HOMEPAGE] = Q_KEY_CODE_AC_HOME,
- [KEY_REFRESH] = Q_KEY_CODE_AC_REFRESH,
- [KEY_FIND] = Q_KEY_CODE_FIND,
-
- [KEY_NEXTSONG] = Q_KEY_CODE_AUDIONEXT,
- [KEY_PREVIOUSSONG] = Q_KEY_CODE_AUDIOPREV,
- [KEY_STOPCD] = Q_KEY_CODE_AUDIOSTOP,
- [KEY_PLAYCD] = Q_KEY_CODE_AUDIOPLAY,
- [KEY_MUTE] = Q_KEY_CODE_AUDIOMUTE,
- [KEY_VOLUMEDOWN] = Q_KEY_CODE_VOLUMEDOWN,
- [KEY_VOLUMEUP] = Q_KEY_CODE_VOLUMEUP,
-};
-
-static const int qcode_to_number[] = {
- [Q_KEY_CODE_SHIFT] = 0x2a,
- [Q_KEY_CODE_SHIFT_R] = 0x36,
-
- [Q_KEY_CODE_ALT] = 0x38,
- [Q_KEY_CODE_ALT_R] = 0xb8,
- [Q_KEY_CODE_CTRL] = 0x1d,
- [Q_KEY_CODE_CTRL_R] = 0x9d,
-
- [Q_KEY_CODE_META_L] = 0xdb,
- [Q_KEY_CODE_META_R] = 0xdc,
- [Q_KEY_CODE_MENU] = 0xdd,
-
- [Q_KEY_CODE_ESC] = 0x01,
-
- [Q_KEY_CODE_1] = 0x02,
- [Q_KEY_CODE_2] = 0x03,
- [Q_KEY_CODE_3] = 0x04,
- [Q_KEY_CODE_4] = 0x05,
- [Q_KEY_CODE_5] = 0x06,
- [Q_KEY_CODE_6] = 0x07,
- [Q_KEY_CODE_7] = 0x08,
- [Q_KEY_CODE_8] = 0x09,
- [Q_KEY_CODE_9] = 0x0a,
- [Q_KEY_CODE_0] = 0x0b,
- [Q_KEY_CODE_MINUS] = 0x0c,
- [Q_KEY_CODE_EQUAL] = 0x0d,
- [Q_KEY_CODE_BACKSPACE] = 0x0e,
-
- [Q_KEY_CODE_TAB] = 0x0f,
- [Q_KEY_CODE_Q] = 0x10,
- [Q_KEY_CODE_W] = 0x11,
- [Q_KEY_CODE_E] = 0x12,
- [Q_KEY_CODE_R] = 0x13,
- [Q_KEY_CODE_T] = 0x14,
- [Q_KEY_CODE_Y] = 0x15,
- [Q_KEY_CODE_U] = 0x16,
- [Q_KEY_CODE_I] = 0x17,
- [Q_KEY_CODE_O] = 0x18,
- [Q_KEY_CODE_P] = 0x19,
- [Q_KEY_CODE_BRACKET_LEFT] = 0x1a,
- [Q_KEY_CODE_BRACKET_RIGHT] = 0x1b,
- [Q_KEY_CODE_RET] = 0x1c,
-
- [Q_KEY_CODE_A] = 0x1e,
- [Q_KEY_CODE_S] = 0x1f,
- [Q_KEY_CODE_D] = 0x20,
- [Q_KEY_CODE_F] = 0x21,
- [Q_KEY_CODE_G] = 0x22,
- [Q_KEY_CODE_H] = 0x23,
- [Q_KEY_CODE_J] = 0x24,
- [Q_KEY_CODE_K] = 0x25,
- [Q_KEY_CODE_L] = 0x26,
- [Q_KEY_CODE_SEMICOLON] = 0x27,
- [Q_KEY_CODE_APOSTROPHE] = 0x28,
- [Q_KEY_CODE_GRAVE_ACCENT] = 0x29,
-
- [Q_KEY_CODE_BACKSLASH] = 0x2b,
- [Q_KEY_CODE_Z] = 0x2c,
- [Q_KEY_CODE_X] = 0x2d,
- [Q_KEY_CODE_C] = 0x2e,
- [Q_KEY_CODE_V] = 0x2f,
- [Q_KEY_CODE_B] = 0x30,
- [Q_KEY_CODE_N] = 0x31,
- [Q_KEY_CODE_M] = 0x32,
- [Q_KEY_CODE_COMMA] = 0x33,
- [Q_KEY_CODE_DOT] = 0x34,
- [Q_KEY_CODE_SLASH] = 0x35,
-
- [Q_KEY_CODE_ASTERISK] = 0x37,
-
- [Q_KEY_CODE_SPC] = 0x39,
- [Q_KEY_CODE_CAPS_LOCK] = 0x3a,
- [Q_KEY_CODE_F1] = 0x3b,
- [Q_KEY_CODE_F2] = 0x3c,
- [Q_KEY_CODE_F3] = 0x3d,
- [Q_KEY_CODE_F4] = 0x3e,
- [Q_KEY_CODE_F5] = 0x3f,
- [Q_KEY_CODE_F6] = 0x40,
- [Q_KEY_CODE_F7] = 0x41,
- [Q_KEY_CODE_F8] = 0x42,
- [Q_KEY_CODE_F9] = 0x43,
- [Q_KEY_CODE_F10] = 0x44,
- [Q_KEY_CODE_NUM_LOCK] = 0x45,
- [Q_KEY_CODE_SCROLL_LOCK] = 0x46,
-
- [Q_KEY_CODE_KP_DIVIDE] = 0xb5,
- [Q_KEY_CODE_KP_MULTIPLY] = 0x37,
- [Q_KEY_CODE_KP_SUBTRACT] = 0x4a,
- [Q_KEY_CODE_KP_ADD] = 0x4e,
- [Q_KEY_CODE_KP_ENTER] = 0x9c,
- [Q_KEY_CODE_KP_DECIMAL] = 0x53,
- [Q_KEY_CODE_SYSRQ] = 0x54,
- [Q_KEY_CODE_PAUSE] = 0xc6,
-
- [Q_KEY_CODE_KP_0] = 0x52,
- [Q_KEY_CODE_KP_1] = 0x4f,
- [Q_KEY_CODE_KP_2] = 0x50,
- [Q_KEY_CODE_KP_3] = 0x51,
- [Q_KEY_CODE_KP_4] = 0x4b,
- [Q_KEY_CODE_KP_5] = 0x4c,
- [Q_KEY_CODE_KP_6] = 0x4d,
- [Q_KEY_CODE_KP_7] = 0x47,
- [Q_KEY_CODE_KP_8] = 0x48,
- [Q_KEY_CODE_KP_9] = 0x49,
-
- [Q_KEY_CODE_LESS] = 0x56,
-
- [Q_KEY_CODE_F11] = 0x57,
- [Q_KEY_CODE_F12] = 0x58,
-
- [Q_KEY_CODE_PRINT] = 0xb7,
-
- [Q_KEY_CODE_HOME] = 0xc7,
- [Q_KEY_CODE_PGUP] = 0xc9,
- [Q_KEY_CODE_PGDN] = 0xd1,
- [Q_KEY_CODE_END] = 0xcf,
-
- [Q_KEY_CODE_LEFT] = 0xcb,
- [Q_KEY_CODE_UP] = 0xc8,
- [Q_KEY_CODE_DOWN] = 0xd0,
- [Q_KEY_CODE_RIGHT] = 0xcd,
-
- [Q_KEY_CODE_INSERT] = 0xd2,
- [Q_KEY_CODE_DELETE] = 0xd3,
-
- [Q_KEY_CODE_RO] = 0x73,
- [Q_KEY_CODE_HIRAGANA] = 0x70,
- [Q_KEY_CODE_HENKAN] = 0x79,
- [Q_KEY_CODE_POWER] = 0xde,
- [Q_KEY_CODE_YEN] = 0x7d,
- [Q_KEY_CODE_KP_COMMA] = 0x7e,
-
- [Q_KEY_CODE_SLEEP] = 0xdf,
- [Q_KEY_CODE_WAKE] = 0xe3,
- [Q_KEY_CODE_CALCULATOR] = 0xa1,
- [Q_KEY_CODE_MAIL] = 0xec,
- [Q_KEY_CODE_COMPUTER] = 0xeb,
-
- [Q_KEY_CODE_STOP] = 0xe8,
- [Q_KEY_CODE_AC_BOOKMARKS] = 0xe6,
- [Q_KEY_CODE_AC_BACK] = 0xea,
- [Q_KEY_CODE_AC_FORWARD] = 0xe9,
- [Q_KEY_CODE_AC_HOME] = 0xb2,
- [Q_KEY_CODE_AC_REFRESH] = 0xe7,
- [Q_KEY_CODE_FIND] = 0xe5,
-
- [Q_KEY_CODE_AUDIONEXT] = 0x99,
- [Q_KEY_CODE_AUDIOPREV] = 0x90,
- [Q_KEY_CODE_AUDIOSTOP] = 0xa4,
- [Q_KEY_CODE_AUDIOPLAY] = 0xa2,
- [Q_KEY_CODE_AUDIOMUTE] = 0xa0,
- [Q_KEY_CODE_VOLUMEDOWN] = 0xae,
- [Q_KEY_CODE_VOLUMEUP] = 0xb0,
-
- [Q_KEY_CODE__MAX] = 0,
-};
-
-static int number_to_qcode[0x100];
+#include "ui/input-keymap-linux2qcode.c"
+#include "ui/input-keymap-qcode2qnum.c"
+#include "ui/input-keymap-qnum2qcode.c"
int qemu_input_linux_to_qcode(unsigned int lnx)
{
- assert(lnx < KEY_CNT);
- return linux_to_qcode[lnx];
+ if (lnx >= qemu_input_map_linux2qcode_len) {
+ return 0;
+ }
+ return qemu_input_map_linux2qcode[lnx];
}
int qemu_input_key_value_to_number(const KeyValue *value)
{
if (value->type == KEY_VALUE_KIND_QCODE) {
- return qcode_to_number[value->u.qcode.data];
+ if (value->u.qcode.data >= qemu_input_map_qcode2qnum_len) {
+ return 0;
+ }
+ return qemu_input_map_qcode2qnum[value->u.qcode.data];
} else {
assert(value->type == KEY_VALUE_KIND_NUMBER);
return value->u.number.data;
}
}
-int qemu_input_key_number_to_qcode(uint8_t nr)
+int qemu_input_key_number_to_qcode(unsigned int nr)
{
- static int first = true;
-
- if (first) {
- int qcode, number;
- first = false;
- for (qcode = 0; qcode < Q_KEY_CODE__MAX; qcode++) {
- number = qcode_to_number[qcode];
- assert(number < ARRAY_SIZE(number_to_qcode));
- number_to_qcode[number] = qcode;
- }
+ if (nr >= qemu_input_map_qnum2qcode_len) {
+ return 0;
}
-
- return number_to_qcode[nr];
+ return qemu_input_map_qnum2qcode[nr];
}
int qemu_input_key_value_to_qcode(const KeyValue *value)
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 03/15] ui: convert key events to QKeyCodes immediately
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 01/15] ui: add keycodemapdb repository as a GIT submodule Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 02/15] ui: convert common input code to keycodemapdb Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 19:11 ` Eric Blake
2017-08-10 15:55 ` [Qemu-devel] [PATCH 04/15] ui: don't export qemu_input_event_new_key Daniel P. Berrange
` (16 subsequent siblings)
19 siblings, 1 reply; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
Always use QKeyCode in the InputKeyEvent struct, by converting key
numbers to QKeyCode at the time the event is created.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
ui/input.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/ui/input.c b/ui/input.c
index af05f06368..64e9103a61 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -400,10 +400,8 @@ void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down)
void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down)
{
- KeyValue *key = g_new0(KeyValue, 1);
- key->type = KEY_VALUE_KIND_NUMBER;
- key->u.number.data = num;
- qemu_input_event_send_key(src, key, down);
+ QKeyCode code = qemu_input_key_number_to_qcode(num);
+ qemu_input_event_send_key_qcode(src, code, down);
}
void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down)
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 04/15] ui: don't export qemu_input_event_new_key
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (2 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 03/15] ui: convert key events to QKeyCodes immediately Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 05/15] ui: use QKeyCode exclusively in InputKeyEvent Daniel P. Berrange
` (15 subsequent siblings)
19 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
All public code should use qemu_input_event_send_key* functions
instead of creating an event directly.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
include/ui/input.h | 1 -
ui/input.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/ui/input.h b/include/ui/input.h
index 1e1cfa0fdf..576006c370 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -38,7 +38,6 @@ void qemu_input_event_send_impl(QemuConsole *src, InputEvent *evt);
void qemu_input_event_sync(void);
void qemu_input_event_sync_impl(void);
-InputEvent *qemu_input_event_new_key(KeyValue *key, bool down);
void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down);
void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down);
void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down);
diff --git a/ui/input.c b/ui/input.c
index 64e9103a61..ba85bf01a9 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -374,7 +374,7 @@ void qemu_input_event_sync(void)
replay_input_sync_event();
}
-InputEvent *qemu_input_event_new_key(KeyValue *key, bool down)
+static InputEvent *qemu_input_event_new_key(KeyValue *key, bool down)
{
InputEvent *evt = g_new0(InputEvent, 1);
evt->u.key.data = g_new0(InputKeyEvent, 1);
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 05/15] ui: use QKeyCode exclusively in InputKeyEvent
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (3 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 04/15] ui: don't export qemu_input_event_new_key Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 19:02 ` Eric Blake
2017-08-10 15:55 ` [Qemu-devel] [PATCH 06/15] input: convert virtio-input-hid device to keycodemapdb Daniel P. Berrange
` (14 subsequent siblings)
19 siblings, 1 reply; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
Now that keycode numbers are converted to QKeyCodes immediately
when creating input events, the InputKeyEvent struct can be
changed to only accept a QKeyCode, instead of a KeyValue.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
hw/char/escc.c | 2 +-
hw/input/adb.c | 2 +-
hw/input/hid.c | 6 +++---
hw/input/ps2.c | 2 +-
hw/input/virtio-input-hid.c | 2 +-
include/ui/input.h | 7 ++-----
qapi-schema.json | 2 +-
replay/replay-input.c | 36 ++++------------------------------
ui/input-keymap.c | 32 ++++++++----------------------
ui/input-legacy.c | 31 +++++++++++++++++-------------
ui/input.c | 47 +++++++++++++--------------------------------
ui/trace-events | 1 -
12 files changed, 53 insertions(+), 117 deletions(-)
diff --git a/hw/char/escc.c b/hw/char/escc.c
index 1aca564e33..5af7f0cddf 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -847,7 +847,7 @@ static void sunkbd_handle_event(DeviceState *dev, QemuConsole *src,
assert(evt->type == INPUT_EVENT_KIND_KEY);
key = evt->u.key.data;
- qcode = qemu_input_key_value_to_qcode(key->key);
+ qcode = key->key;
trace_escc_sunkbd_event_in(qcode, QKeyCode_lookup[qcode],
key->down);
diff --git a/hw/input/adb.c b/hw/input/adb.c
index fcca3a8eb9..992f5bd1c4 100644
--- a/hw/input/adb.c
+++ b/hw/input/adb.c
@@ -438,7 +438,7 @@ static void adb_keyboard_event(DeviceState *dev, QemuConsole *src,
KBDState *s = (KBDState *)dev;
int qcode, keycode;
- qcode = qemu_input_key_value_to_qcode(evt->u.key.data->key);
+ qcode = evt->u.key.data->key;
if (qcode >= ARRAY_SIZE(qcode_to_adb_keycode)) {
return;
}
diff --git a/hw/input/hid.c b/hw/input/hid.c
index 0d049ff61c..fdb77b8b2a 100644
--- a/hw/input/hid.c
+++ b/hw/input/hid.c
@@ -231,9 +231,9 @@ static void hid_keyboard_event(DeviceState *dev, QemuConsole *src,
int slot;
InputKeyEvent *key = evt->u.key.data;
- count = qemu_input_key_value_to_scancode(key->key,
- key->down,
- scancodes);
+ count = qemu_input_qcode_to_scancode(key->key,
+ key->down,
+ scancodes);
if (hs->n + count > QUEUE_LENGTH) {
trace_hid_kbd_queue_full();
return;
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 77906d5f46..14b1d85f6c 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -599,7 +599,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
assert(evt->type == INPUT_EVENT_KIND_KEY);
- qcode = qemu_input_key_value_to_qcode(key->key);
+ qcode = key->key;
if (s->scancode_set == 1) {
if (qcode == Q_KEY_CODE_PAUSE) {
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index 46c038110c..7a04e21b33 100644
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -200,7 +200,7 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src,
switch (evt->type) {
case INPUT_EVENT_KIND_KEY:
key = evt->u.key.data;
- qcode = qemu_input_key_value_to_qcode(key->key);
+ qcode = key->key;
if (qcode && keymap_qcode[qcode]) {
event.type = cpu_to_le16(EV_KEY);
event.code = cpu_to_le16(keymap_qcode[qcode]);
diff --git a/include/ui/input.h b/include/ui/input.h
index 576006c370..5577cbcb04 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -38,15 +38,12 @@ void qemu_input_event_send_impl(QemuConsole *src, InputEvent *evt);
void qemu_input_event_sync(void);
void qemu_input_event_sync_impl(void);
-void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down);
void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down);
void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down);
void qemu_input_event_send_key_delay(uint32_t delay_ms);
int qemu_input_key_number_to_qcode(unsigned int nr);
-int qemu_input_key_value_to_number(const KeyValue *value);
-int qemu_input_key_value_to_qcode(const KeyValue *value);
-int qemu_input_key_value_to_scancode(const KeyValue *value, bool down,
- int *codes);
+int qemu_input_qcode_to_number(QKeyCode qcode);
+int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down, int *codes);
int qemu_input_linux_to_qcode(unsigned int lnx);
InputEvent *qemu_input_event_new_btn(InputButton btn, bool down);
diff --git a/qapi-schema.json b/qapi-schema.json
index 802ea53d00..fa6e99ee9c 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -5747,7 +5747,7 @@
# Since: 2.0
##
{ 'struct' : 'InputKeyEvent',
- 'data' : { 'key' : 'KeyValue',
+ 'data' : { 'key' : 'QKeyCode',
'down' : 'bool' } }
##
diff --git a/replay/replay-input.c b/replay/replay-input.c
index bd93554d8e..577609f24b 100644
--- a/replay/replay-input.c
+++ b/replay/replay-input.c
@@ -28,21 +28,8 @@ void replay_save_input_event(InputEvent *evt)
switch (evt->type) {
case INPUT_EVENT_KIND_KEY:
key = evt->u.key.data;
- replay_put_dword(key->key->type);
-
- switch (key->key->type) {
- case KEY_VALUE_KIND_NUMBER:
- replay_put_qword(key->key->u.number.data);
- replay_put_byte(key->down);
- break;
- case KEY_VALUE_KIND_QCODE:
- replay_put_dword(key->key->u.qcode.data);
- replay_put_byte(key->down);
- break;
- case KEY_VALUE_KIND__MAX:
- /* keep gcc happy */
- break;
- }
+ replay_put_dword(key->key);
+ replay_put_byte(key->down);
break;
case INPUT_EVENT_KIND_BTN:
btn = evt->u.btn.data;
@@ -68,9 +55,7 @@ void replay_save_input_event(InputEvent *evt)
InputEvent *replay_read_input_event(void)
{
InputEvent evt;
- KeyValue keyValue;
InputKeyEvent key;
- key.key = &keyValue;
InputBtnEvent btn;
InputMoveEvent rel;
InputMoveEvent abs;
@@ -79,21 +64,8 @@ InputEvent *replay_read_input_event(void)
switch (evt.type) {
case INPUT_EVENT_KIND_KEY:
evt.u.key.data = &key;
- evt.u.key.data->key->type = replay_get_dword();
-
- switch (evt.u.key.data->key->type) {
- case KEY_VALUE_KIND_NUMBER:
- evt.u.key.data->key->u.number.data = replay_get_qword();
- evt.u.key.data->down = replay_get_byte();
- break;
- case KEY_VALUE_KIND_QCODE:
- evt.u.key.data->key->u.qcode.data = (QKeyCode)replay_get_dword();
- evt.u.key.data->down = replay_get_byte();
- break;
- case KEY_VALUE_KIND__MAX:
- /* keep gcc happy */
- break;
- }
+ evt.u.key.data->key = (QKeyCode)replay_get_dword();
+ evt.u.key.data->down = replay_get_byte();
break;
case INPUT_EVENT_KIND_BTN:
evt.u.btn.data = &btn;
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index bbbb66bae7..f585ab764b 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -17,17 +17,12 @@ int qemu_input_linux_to_qcode(unsigned int lnx)
return qemu_input_map_linux2qcode[lnx];
}
-int qemu_input_key_value_to_number(const KeyValue *value)
+int qemu_input_qcode_to_number(QKeyCode qcode)
{
- if (value->type == KEY_VALUE_KIND_QCODE) {
- if (value->u.qcode.data >= qemu_input_map_qcode2qnum_len) {
- return 0;
- }
- return qemu_input_map_qcode2qnum[value->u.qcode.data];
- } else {
- assert(value->type == KEY_VALUE_KIND_NUMBER);
- return value->u.number.data;
+ if (qcode >= qemu_input_map_qcode2qnum_len) {
+ return 0;
}
+ return qemu_input_map_qcode2qnum[qcode];
}
int qemu_input_key_number_to_qcode(unsigned int nr)
@@ -38,24 +33,13 @@ int qemu_input_key_number_to_qcode(unsigned int nr)
return qemu_input_map_qnum2qcode[nr];
}
-int qemu_input_key_value_to_qcode(const KeyValue *value)
-{
- if (value->type == KEY_VALUE_KIND_QCODE) {
- return value->u.qcode.data;
- } else {
- assert(value->type == KEY_VALUE_KIND_NUMBER);
- return qemu_input_key_number_to_qcode(value->u.number.data);
- }
-}
-
-int qemu_input_key_value_to_scancode(const KeyValue *value, bool down,
- int *codes)
+int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down,
+ int *codes)
{
- int keycode = qemu_input_key_value_to_number(value);
+ int keycode = qemu_input_qcode_to_number(qcode);
int count = 0;
- if (value->type == KEY_VALUE_KIND_QCODE &&
- value->u.qcode.data == Q_KEY_CODE_PAUSE) {
+ if (qcode == Q_KEY_CODE_PAUSE) {
/* specific case */
int v = down ? 0 : 0x80;
codes[count++] = 0xe1;
diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index 7159747404..204b2ba2ae 100644
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -72,18 +72,12 @@ int index_from_key(const char *key, size_t key_length)
return i;
}
-static KeyValue *copy_key_value(KeyValue *src)
-{
- KeyValue *dst = g_new(KeyValue, 1);
- memcpy(dst, src, sizeof(*src));
- return dst;
-}
void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time,
Error **errp)
{
KeyValueList *p;
- KeyValue **up = NULL;
+ QKeyCode *up = NULL;
int count = 0;
if (!has_hold_time) {
@@ -91,15 +85,26 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time,
}
for (p = keys; p != NULL; p = p->next) {
- qemu_input_event_send_key(NULL, copy_key_value(p->value), true);
+ QKeyCode qcode;
+ switch (p->value->type) {
+ case KEY_VALUE_KIND_NUMBER:
+ qcode = qemu_input_key_number_to_qcode(p->value->u.number.data);
+ break;
+ case KEY_VALUE_KIND_QCODE:
+ qcode = p->value->u.qcode.data;
+ break;
+ default:
+ continue;
+ }
+ qemu_input_event_send_key_qcode(NULL, qcode, true);
qemu_input_event_send_key_delay(hold_time);
up = g_realloc(up, sizeof(*up) * (count+1));
- up[count] = copy_key_value(p->value);
+ up[count] = qcode;
count++;
}
while (count) {
count--;
- qemu_input_event_send_key(NULL, up[count], false);
+ qemu_input_event_send_key_qcode(NULL, up[count], false);
qemu_input_event_send_key_delay(hold_time);
}
g_free(up);
@@ -115,9 +120,9 @@ static void legacy_kbd_event(DeviceState *dev, QemuConsole *src,
if (!entry || !entry->put_kbd) {
return;
}
- count = qemu_input_key_value_to_scancode(key->key,
- key->down,
- scancodes);
+ count = qemu_input_qcode_to_scancode(key->key,
+ key->down,
+ scancodes);
for (i = 0; i < count; i++) {
entry->put_kbd(entry->opaque, scancodes[i]);
}
diff --git a/ui/input.c b/ui/input.c
index ba85bf01a9..8529929ea9 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -199,7 +199,7 @@ static void qemu_input_transform_abs_rotate(InputEvent *evt)
static void qemu_input_event_trace(QemuConsole *src, InputEvent *evt)
{
const char *name;
- int qcode, idx = -1;
+ int idx = -1;
InputKeyEvent *key;
InputBtnEvent *btn;
InputMoveEvent *move;
@@ -210,21 +210,8 @@ static void qemu_input_event_trace(QemuConsole *src, InputEvent *evt)
switch (evt->type) {
case INPUT_EVENT_KIND_KEY:
key = evt->u.key.data;
- switch (key->key->type) {
- case KEY_VALUE_KIND_NUMBER:
- qcode = qemu_input_key_number_to_qcode(key->key->u.number.data);
- name = QKeyCode_lookup[qcode];
- trace_input_event_key_number(idx, key->key->u.number.data,
- name, key->down);
- break;
- case KEY_VALUE_KIND_QCODE:
- name = QKeyCode_lookup[key->key->u.qcode.data];
- trace_input_event_key_qcode(idx, name, key->down);
- break;
- case KEY_VALUE_KIND__MAX:
- /* keep gcc happy */
- break;
- }
+ name = QKeyCode_lookup[key->key];
+ trace_input_event_key_qcode(idx, name, key->down);
break;
case INPUT_EVENT_KIND_BTN:
btn = evt->u.btn.data;
@@ -374,20 +361,26 @@ void qemu_input_event_sync(void)
replay_input_sync_event();
}
-static InputEvent *qemu_input_event_new_key(KeyValue *key, bool down)
+static InputEvent *qemu_input_event_new_key(QKeyCode qcode, bool down)
{
InputEvent *evt = g_new0(InputEvent, 1);
evt->u.key.data = g_new0(InputKeyEvent, 1);
evt->type = INPUT_EVENT_KIND_KEY;
- evt->u.key.data->key = key;
+ evt->u.key.data->key = qcode;
evt->u.key.data->down = down;
return evt;
}
-void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down)
+void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down)
+{
+ QKeyCode code = qemu_input_key_number_to_qcode(num);
+ qemu_input_event_send_key_qcode(src, code, down);
+}
+
+void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode qcode, bool down)
{
InputEvent *evt;
- evt = qemu_input_event_new_key(key, down);
+ evt = qemu_input_event_new_key(qcode, down);
if (QTAILQ_EMPTY(&kbd_queue)) {
qemu_input_event_send(src, evt);
qemu_input_event_sync();
@@ -398,20 +391,6 @@ void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down)
}
}
-void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down)
-{
- QKeyCode code = qemu_input_key_number_to_qcode(num);
- qemu_input_event_send_key_qcode(src, code, down);
-}
-
-void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down)
-{
- KeyValue *key = g_new0(KeyValue, 1);
- key->type = KEY_VALUE_KIND_QCODE;
- key->u.qcode.data = q;
- qemu_input_event_send_key(src, key, down);
-}
-
void qemu_input_event_send_key_delay(uint32_t delay_ms)
{
if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) {
diff --git a/ui/trace-events b/ui/trace-events
index 34c2213700..2a69660e5a 100644
--- a/ui/trace-events
+++ b/ui/trace-events
@@ -31,7 +31,6 @@ vnc_key_sync_numlock(bool on) "%d"
vnc_key_sync_capslock(bool on) "%d"
# ui/input.c
-input_event_key_number(int conidx, int number, const char *qcode, bool down) "con %d, key number 0x%x [%s], down %d"
input_event_key_qcode(int conidx, const char *qcode, bool down) "con %d, key qcode %s, down %d"
input_event_btn(int conidx, const char *btn, bool down) "con %d, button %s, down %d"
input_event_rel(int conidx, const char *axis, int value) "con %d, axis %s, value %d"
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 06/15] input: convert virtio-input-hid device to keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (4 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 05/15] ui: use QKeyCode exclusively in InputKeyEvent Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-21 13:49 ` Gerd Hoffmann
2017-08-10 15:55 ` [Qemu-devel] [PATCH 07/15] input: convert ps2 " Daniel P. Berrange
` (13 subsequent siblings)
19 siblings, 1 reply; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
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
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
hw/input/virtio-input-hid.c | 136 +++-----------------------------------------
include/ui/input.h | 3 +
ui/Makefile.objs | 1 +
ui/input-keymap.c | 1 +
4 files changed, 14 insertions(+), 127 deletions(-)
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index 7a04e21b33..47efc6f35b 100644
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -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,
@@ -149,12 +30,12 @@ static const unsigned int keymap_button[INPUT_BUTTON__MAX] = {
[INPUT_BUTTON_WHEEL_DOWN] = BTN_GEAR_DOWN,
};
-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,
};
@@ -162,7 +43,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;
@@ -201,9 +82,10 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src,
case INPUT_EVENT_KIND_KEY:
key = evt->u.key.data;
qcode = key->key;
- if (qcode && keymap_qcode[qcode]) {
+ if (qcode < qemu_input_map_qcode2linux_len &&
+ qemu_input_map_qcode2linux[qcode]) {
event.type = cpu_to_le16(EV_KEY);
- event.code = cpu_to_le16(keymap_qcode[qcode]);
+ event.code = cpu_to_le16(qemu_input_map_qcode2linux[qcode]);
event.value = cpu_to_le32(key->down ? 1 : 0);
virtio_input_send(vinput, &event);
} else {
@@ -387,8 +269,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_qcode2linux,
+ qemu_input_map_qcode2linux_len);
}
static const TypeInfo virtio_keyboard_info = {
diff --git a/include/ui/input.h b/include/ui/input.h
index 5577cbcb04..aac3b79924 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -68,6 +68,9 @@ void qemu_remove_mouse_mode_change_notifier(Notifier *notify);
extern const guint qemu_input_map_linux2qcode_len;
extern const guint16 qemu_input_map_linux2qcode[];
+extern const guint qemu_input_map_qcode2linux_len;
+extern const guint16 qemu_input_map_qcode2linux[];
+
extern const guint qemu_input_map_qcode2qnum_len;
extern const guint16 qemu_input_map_qcode2qnum[];
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 964fabdd3a..1ea232b552 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -55,6 +55,7 @@ KEYCODEMAP_CSV = ui/keycodemapdb/data/keymaps.csv
KEYCODEMAP_FILES = \
ui/input-keymap-linux2qcode.c \
+ ui/input-keymap-qcode2linux.c \
ui/input-keymap-qcode2qnum.c \
ui/input-keymap-qnum2qcode.c \
$(NULL)
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index f585ab764b..65eddf3cfa 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -6,6 +6,7 @@
#include "standard-headers/linux/input.h"
#include "ui/input-keymap-linux2qcode.c"
+#include "ui/input-keymap-qcode2linux.c"
#include "ui/input-keymap-qcode2qnum.c"
#include "ui/input-keymap-qnum2qcode.c"
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 07/15] input: convert ps2 device to keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (5 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 06/15] input: convert virtio-input-hid device to keycodemapdb Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 08/15] input: convert the adb " Daniel P. Berrange
` (12 subsequent siblings)
19 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
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 <berrange@redhat.com>
---
hw/input/ps2.c | 406 +----------------------------------------------------
include/ui/input.h | 9 ++
ui/Makefile.objs | 3 +
ui/input-keymap.c | 3 +
4 files changed, 22 insertions(+), 399 deletions(-)
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 14b1d85f6c..86529a058a 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -115,401 +115,6 @@ typedef struct {
uint8_t mouse_buttons;
} PS2MouseState;
-/* Table to convert from QEMU codes to scancodes. */
-static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] = {
- [0 ... Q_KEY_CODE__MAX - 1] = 0,
-
- [Q_KEY_CODE_A] = 0x1e,
- [Q_KEY_CODE_B] = 0x30,
- [Q_KEY_CODE_C] = 0x2e,
- [Q_KEY_CODE_D] = 0x20,
- [Q_KEY_CODE_E] = 0x12,
- [Q_KEY_CODE_F] = 0x21,
- [Q_KEY_CODE_G] = 0x22,
- [Q_KEY_CODE_H] = 0x23,
- [Q_KEY_CODE_I] = 0x17,
- [Q_KEY_CODE_J] = 0x24,
- [Q_KEY_CODE_K] = 0x25,
- [Q_KEY_CODE_L] = 0x26,
- [Q_KEY_CODE_M] = 0x32,
- [Q_KEY_CODE_N] = 0x31,
- [Q_KEY_CODE_O] = 0x18,
- [Q_KEY_CODE_P] = 0x19,
- [Q_KEY_CODE_Q] = 0x10,
- [Q_KEY_CODE_R] = 0x13,
- [Q_KEY_CODE_S] = 0x1f,
- [Q_KEY_CODE_T] = 0x14,
- [Q_KEY_CODE_U] = 0x16,
- [Q_KEY_CODE_V] = 0x2f,
- [Q_KEY_CODE_W] = 0x11,
- [Q_KEY_CODE_X] = 0x2d,
- [Q_KEY_CODE_Y] = 0x15,
- [Q_KEY_CODE_Z] = 0x2c,
- [Q_KEY_CODE_0] = 0x0b,
- [Q_KEY_CODE_1] = 0x02,
- [Q_KEY_CODE_2] = 0x03,
- [Q_KEY_CODE_3] = 0x04,
- [Q_KEY_CODE_4] = 0x05,
- [Q_KEY_CODE_5] = 0x06,
- [Q_KEY_CODE_6] = 0x07,
- [Q_KEY_CODE_7] = 0x08,
- [Q_KEY_CODE_8] = 0x09,
- [Q_KEY_CODE_9] = 0x0a,
- [Q_KEY_CODE_GRAVE_ACCENT] = 0x29,
- [Q_KEY_CODE_MINUS] = 0x0c,
- [Q_KEY_CODE_EQUAL] = 0x0d,
- [Q_KEY_CODE_BACKSLASH] = 0x2b,
- [Q_KEY_CODE_BACKSPACE] = 0x0e,
- [Q_KEY_CODE_SPC] = 0x39,
- [Q_KEY_CODE_TAB] = 0x0f,
- [Q_KEY_CODE_CAPS_LOCK] = 0x3a,
- [Q_KEY_CODE_SHIFT] = 0x2a,
- [Q_KEY_CODE_CTRL] = 0x1d,
- [Q_KEY_CODE_META_L] = 0xe05b,
- [Q_KEY_CODE_ALT] = 0x38,
- [Q_KEY_CODE_SHIFT_R] = 0x36,
- [Q_KEY_CODE_CTRL_R] = 0xe01d,
- [Q_KEY_CODE_META_R] = 0xe05c,
- [Q_KEY_CODE_ALT_R] = 0xe038,
- [Q_KEY_CODE_MENU] = 0xe05d,
- [Q_KEY_CODE_RET] = 0x1c,
- [Q_KEY_CODE_ESC] = 0x01,
- [Q_KEY_CODE_F1] = 0x3b,
- [Q_KEY_CODE_F2] = 0x3c,
- [Q_KEY_CODE_F3] = 0x3d,
- [Q_KEY_CODE_F4] = 0x3e,
- [Q_KEY_CODE_F5] = 0x3f,
- [Q_KEY_CODE_F6] = 0x40,
- [Q_KEY_CODE_F7] = 0x41,
- [Q_KEY_CODE_F8] = 0x42,
- [Q_KEY_CODE_F9] = 0x43,
- [Q_KEY_CODE_F10] = 0x44,
- [Q_KEY_CODE_F11] = 0x57,
- [Q_KEY_CODE_F12] = 0x58,
- /* special handling for Q_KEY_CODE_PRINT */
- [Q_KEY_CODE_SCROLL_LOCK] = 0x46,
- /* special handling for Q_KEY_CODE_PAUSE */
- [Q_KEY_CODE_BRACKET_LEFT] = 0x1a,
- [Q_KEY_CODE_INSERT] = 0xe052,
- [Q_KEY_CODE_HOME] = 0xe047,
- [Q_KEY_CODE_PGUP] = 0xe049,
- [Q_KEY_CODE_DELETE] = 0xe053,
- [Q_KEY_CODE_END] = 0xe04f,
- [Q_KEY_CODE_PGDN] = 0xe051,
- [Q_KEY_CODE_UP] = 0xe048,
- [Q_KEY_CODE_LEFT] = 0xe04b,
- [Q_KEY_CODE_DOWN] = 0xe050,
- [Q_KEY_CODE_RIGHT] = 0xe04d,
- [Q_KEY_CODE_NUM_LOCK] = 0x45,
- [Q_KEY_CODE_KP_DIVIDE] = 0xe035,
- [Q_KEY_CODE_KP_MULTIPLY] = 0x37,
- [Q_KEY_CODE_KP_SUBTRACT] = 0x4a,
- [Q_KEY_CODE_KP_ADD] = 0x4e,
- [Q_KEY_CODE_KP_ENTER] = 0xe01c,
- [Q_KEY_CODE_KP_DECIMAL] = 0x53,
- [Q_KEY_CODE_KP_0] = 0x52,
- [Q_KEY_CODE_KP_1] = 0x4f,
- [Q_KEY_CODE_KP_2] = 0x50,
- [Q_KEY_CODE_KP_3] = 0x51,
- [Q_KEY_CODE_KP_4] = 0x4b,
- [Q_KEY_CODE_KP_5] = 0x4c,
- [Q_KEY_CODE_KP_6] = 0x4d,
- [Q_KEY_CODE_KP_7] = 0x47,
- [Q_KEY_CODE_KP_8] = 0x48,
- [Q_KEY_CODE_KP_9] = 0x49,
- [Q_KEY_CODE_BRACKET_RIGHT] = 0x1b,
- [Q_KEY_CODE_SEMICOLON] = 0x27,
- [Q_KEY_CODE_APOSTROPHE] = 0x28,
- [Q_KEY_CODE_COMMA] = 0x33,
- [Q_KEY_CODE_DOT] = 0x34,
- [Q_KEY_CODE_SLASH] = 0x35,
-
- [Q_KEY_CODE_POWER] = 0x0e5e,
- [Q_KEY_CODE_SLEEP] = 0x0e5f,
- [Q_KEY_CODE_WAKE] = 0x0e63,
-
- [Q_KEY_CODE_AUDIONEXT] = 0xe019,
- [Q_KEY_CODE_AUDIOPREV] = 0xe010,
- [Q_KEY_CODE_AUDIOSTOP] = 0xe024,
- [Q_KEY_CODE_AUDIOPLAY] = 0xe022,
- [Q_KEY_CODE_AUDIOMUTE] = 0xe020,
- [Q_KEY_CODE_VOLUMEUP] = 0xe030,
- [Q_KEY_CODE_VOLUMEDOWN] = 0xe02e,
- [Q_KEY_CODE_MEDIASELECT] = 0xe06d,
- [Q_KEY_CODE_MAIL] = 0xe06c,
- [Q_KEY_CODE_CALCULATOR] = 0xe021,
- [Q_KEY_CODE_COMPUTER] = 0xe06b,
- [Q_KEY_CODE_FIND] = 0xe065,
- [Q_KEY_CODE_AC_HOME] = 0xe032,
- [Q_KEY_CODE_AC_BACK] = 0xe06a,
- [Q_KEY_CODE_AC_FORWARD] = 0xe069,
- [Q_KEY_CODE_STOP] = 0xe068,
- [Q_KEY_CODE_AC_REFRESH] = 0xe067,
- [Q_KEY_CODE_AC_BOOKMARKS] = 0xe066,
-
- [Q_KEY_CODE_ASTERISK] = 0x37,
- [Q_KEY_CODE_LESS] = 0x56,
- [Q_KEY_CODE_RO] = 0x73,
- [Q_KEY_CODE_HIRAGANA] = 0x70,
- [Q_KEY_CODE_HENKAN] = 0x79,
- [Q_KEY_CODE_YEN] = 0x7d,
- [Q_KEY_CODE_KP_COMMA] = 0x7e,
-};
-
-static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = {
- [0 ... Q_KEY_CODE__MAX - 1] = 0,
-
- [Q_KEY_CODE_A] = 0x1c,
- [Q_KEY_CODE_B] = 0x32,
- [Q_KEY_CODE_C] = 0x21,
- [Q_KEY_CODE_D] = 0x23,
- [Q_KEY_CODE_E] = 0x24,
- [Q_KEY_CODE_F] = 0x2b,
- [Q_KEY_CODE_G] = 0x34,
- [Q_KEY_CODE_H] = 0x33,
- [Q_KEY_CODE_I] = 0x43,
- [Q_KEY_CODE_J] = 0x3b,
- [Q_KEY_CODE_K] = 0x42,
- [Q_KEY_CODE_L] = 0x4b,
- [Q_KEY_CODE_M] = 0x3a,
- [Q_KEY_CODE_N] = 0x31,
- [Q_KEY_CODE_O] = 0x44,
- [Q_KEY_CODE_P] = 0x4d,
- [Q_KEY_CODE_Q] = 0x15,
- [Q_KEY_CODE_R] = 0x2d,
- [Q_KEY_CODE_S] = 0x1b,
- [Q_KEY_CODE_T] = 0x2c,
- [Q_KEY_CODE_U] = 0x3c,
- [Q_KEY_CODE_V] = 0x2a,
- [Q_KEY_CODE_W] = 0x1d,
- [Q_KEY_CODE_X] = 0x22,
- [Q_KEY_CODE_Y] = 0x35,
- [Q_KEY_CODE_Z] = 0x1a,
- [Q_KEY_CODE_0] = 0x45,
- [Q_KEY_CODE_1] = 0x16,
- [Q_KEY_CODE_2] = 0x1e,
- [Q_KEY_CODE_3] = 0x26,
- [Q_KEY_CODE_4] = 0x25,
- [Q_KEY_CODE_5] = 0x2e,
- [Q_KEY_CODE_6] = 0x36,
- [Q_KEY_CODE_7] = 0x3d,
- [Q_KEY_CODE_8] = 0x3e,
- [Q_KEY_CODE_9] = 0x46,
- [Q_KEY_CODE_GRAVE_ACCENT] = 0x0e,
- [Q_KEY_CODE_MINUS] = 0x4e,
- [Q_KEY_CODE_EQUAL] = 0x55,
- [Q_KEY_CODE_BACKSLASH] = 0x5d,
- [Q_KEY_CODE_BACKSPACE] = 0x66,
- [Q_KEY_CODE_SPC] = 0x29,
- [Q_KEY_CODE_TAB] = 0x0d,
- [Q_KEY_CODE_CAPS_LOCK] = 0x58,
- [Q_KEY_CODE_SHIFT] = 0x12,
- [Q_KEY_CODE_CTRL] = 0x14,
- [Q_KEY_CODE_META_L] = 0xe01f,
- [Q_KEY_CODE_ALT] = 0x11,
- [Q_KEY_CODE_SHIFT_R] = 0x59,
- [Q_KEY_CODE_CTRL_R] = 0xe014,
- [Q_KEY_CODE_META_R] = 0xe027,
- [Q_KEY_CODE_ALT_R] = 0xe011,
- [Q_KEY_CODE_MENU] = 0xe02f,
- [Q_KEY_CODE_RET] = 0x5a,
- [Q_KEY_CODE_ESC] = 0x76,
- [Q_KEY_CODE_F1] = 0x05,
- [Q_KEY_CODE_F2] = 0x06,
- [Q_KEY_CODE_F3] = 0x04,
- [Q_KEY_CODE_F4] = 0x0c,
- [Q_KEY_CODE_F5] = 0x03,
- [Q_KEY_CODE_F6] = 0x0b,
- [Q_KEY_CODE_F7] = 0x83,
- [Q_KEY_CODE_F8] = 0x0a,
- [Q_KEY_CODE_F9] = 0x01,
- [Q_KEY_CODE_F10] = 0x09,
- [Q_KEY_CODE_F11] = 0x78,
- [Q_KEY_CODE_F12] = 0x07,
- /* special handling for Q_KEY_CODE_PRINT */
- [Q_KEY_CODE_SCROLL_LOCK] = 0x7e,
- /* special handling for Q_KEY_CODE_PAUSE */
- [Q_KEY_CODE_BRACKET_LEFT] = 0x54,
- [Q_KEY_CODE_INSERT] = 0xe070,
- [Q_KEY_CODE_HOME] = 0xe06c,
- [Q_KEY_CODE_PGUP] = 0xe07d,
- [Q_KEY_CODE_DELETE] = 0xe071,
- [Q_KEY_CODE_END] = 0xe069,
- [Q_KEY_CODE_PGDN] = 0xe07a,
- [Q_KEY_CODE_UP] = 0xe075,
- [Q_KEY_CODE_LEFT] = 0xe06b,
- [Q_KEY_CODE_DOWN] = 0xe072,
- [Q_KEY_CODE_RIGHT] = 0xe074,
- [Q_KEY_CODE_NUM_LOCK] = 0x77,
- [Q_KEY_CODE_KP_DIVIDE] = 0xe04a,
- [Q_KEY_CODE_KP_MULTIPLY] = 0x7c,
- [Q_KEY_CODE_KP_SUBTRACT] = 0x7b,
- [Q_KEY_CODE_KP_ADD] = 0x79,
- [Q_KEY_CODE_KP_ENTER] = 0xe05a,
- [Q_KEY_CODE_KP_DECIMAL] = 0x71,
- [Q_KEY_CODE_KP_0] = 0x70,
- [Q_KEY_CODE_KP_1] = 0x69,
- [Q_KEY_CODE_KP_2] = 0x72,
- [Q_KEY_CODE_KP_3] = 0x7a,
- [Q_KEY_CODE_KP_4] = 0x6b,
- [Q_KEY_CODE_KP_5] = 0x73,
- [Q_KEY_CODE_KP_6] = 0x74,
- [Q_KEY_CODE_KP_7] = 0x6c,
- [Q_KEY_CODE_KP_8] = 0x75,
- [Q_KEY_CODE_KP_9] = 0x7d,
- [Q_KEY_CODE_BRACKET_RIGHT] = 0x5b,
- [Q_KEY_CODE_SEMICOLON] = 0x4c,
- [Q_KEY_CODE_APOSTROPHE] = 0x52,
- [Q_KEY_CODE_COMMA] = 0x41,
- [Q_KEY_CODE_DOT] = 0x49,
- [Q_KEY_CODE_SLASH] = 0x4a,
-
- [Q_KEY_CODE_POWER] = 0x0e37,
- [Q_KEY_CODE_SLEEP] = 0x0e3f,
- [Q_KEY_CODE_WAKE] = 0x0e5e,
-
- [Q_KEY_CODE_AUDIONEXT] = 0xe04d,
- [Q_KEY_CODE_AUDIOPREV] = 0xe015,
- [Q_KEY_CODE_AUDIOSTOP] = 0xe03b,
- [Q_KEY_CODE_AUDIOPLAY] = 0xe034,
- [Q_KEY_CODE_AUDIOMUTE] = 0xe023,
- [Q_KEY_CODE_VOLUMEUP] = 0xe032,
- [Q_KEY_CODE_VOLUMEDOWN] = 0xe021,
- [Q_KEY_CODE_MEDIASELECT] = 0xe050,
- [Q_KEY_CODE_MAIL] = 0xe048,
- [Q_KEY_CODE_CALCULATOR] = 0xe02b,
- [Q_KEY_CODE_COMPUTER] = 0xe040,
- [Q_KEY_CODE_FIND] = 0xe010,
- [Q_KEY_CODE_AC_HOME] = 0xe03a,
- [Q_KEY_CODE_AC_BACK] = 0xe038,
- [Q_KEY_CODE_AC_FORWARD] = 0xe030,
- [Q_KEY_CODE_STOP] = 0xe028,
- [Q_KEY_CODE_AC_REFRESH] = 0xe020,
- [Q_KEY_CODE_AC_BOOKMARKS] = 0xe018,
-
- [Q_KEY_CODE_ASTERISK] = 0x7c,
- [Q_KEY_CODE_LESS] = 0x61,
- [Q_KEY_CODE_SYSRQ] = 0x7f,
- [Q_KEY_CODE_RO] = 0x51,
- [Q_KEY_CODE_HIRAGANA] = 0x13,
- [Q_KEY_CODE_HENKAN] = 0x64,
- [Q_KEY_CODE_YEN] = 0x6a,
- [Q_KEY_CODE_KP_COMMA] = 0x6d,
-};
-
-static const uint16_t qcode_to_keycode_set3[Q_KEY_CODE__MAX] = {
- [0 ... Q_KEY_CODE__MAX - 1] = 0,
-
- [Q_KEY_CODE_A] = 0x1c,
- [Q_KEY_CODE_B] = 0x32,
- [Q_KEY_CODE_C] = 0x21,
- [Q_KEY_CODE_D] = 0x23,
- [Q_KEY_CODE_E] = 0x24,
- [Q_KEY_CODE_F] = 0x2b,
- [Q_KEY_CODE_G] = 0x34,
- [Q_KEY_CODE_H] = 0x33,
- [Q_KEY_CODE_I] = 0x43,
- [Q_KEY_CODE_J] = 0x3b,
- [Q_KEY_CODE_K] = 0x42,
- [Q_KEY_CODE_L] = 0x4b,
- [Q_KEY_CODE_M] = 0x3a,
- [Q_KEY_CODE_N] = 0x31,
- [Q_KEY_CODE_O] = 0x44,
- [Q_KEY_CODE_P] = 0x4d,
- [Q_KEY_CODE_Q] = 0x15,
- [Q_KEY_CODE_R] = 0x2d,
- [Q_KEY_CODE_S] = 0x1b,
- [Q_KEY_CODE_T] = 0x2c,
- [Q_KEY_CODE_U] = 0x3c,
- [Q_KEY_CODE_V] = 0x2a,
- [Q_KEY_CODE_W] = 0x1d,
- [Q_KEY_CODE_X] = 0x22,
- [Q_KEY_CODE_Y] = 0x35,
- [Q_KEY_CODE_Z] = 0x1a,
- [Q_KEY_CODE_0] = 0x45,
- [Q_KEY_CODE_1] = 0x16,
- [Q_KEY_CODE_2] = 0x1e,
- [Q_KEY_CODE_3] = 0x26,
- [Q_KEY_CODE_4] = 0x25,
- [Q_KEY_CODE_5] = 0x2e,
- [Q_KEY_CODE_6] = 0x36,
- [Q_KEY_CODE_7] = 0x3d,
- [Q_KEY_CODE_8] = 0x3e,
- [Q_KEY_CODE_9] = 0x46,
- [Q_KEY_CODE_GRAVE_ACCENT] = 0x0e,
- [Q_KEY_CODE_MINUS] = 0x4e,
- [Q_KEY_CODE_EQUAL] = 0x55,
- [Q_KEY_CODE_BACKSLASH] = 0x5c,
- [Q_KEY_CODE_BACKSPACE] = 0x66,
- [Q_KEY_CODE_SPC] = 0x29,
- [Q_KEY_CODE_TAB] = 0x0d,
- [Q_KEY_CODE_CAPS_LOCK] = 0x14,
- [Q_KEY_CODE_SHIFT] = 0x12,
- [Q_KEY_CODE_CTRL] = 0x11,
- [Q_KEY_CODE_META_L] = 0x8b,
- [Q_KEY_CODE_ALT] = 0x19,
- [Q_KEY_CODE_SHIFT_R] = 0x59,
- [Q_KEY_CODE_CTRL_R] = 0x58,
- [Q_KEY_CODE_META_R] = 0x8c,
- [Q_KEY_CODE_ALT_R] = 0x39,
- [Q_KEY_CODE_MENU] = 0x8d,
- [Q_KEY_CODE_RET] = 0x5a,
- [Q_KEY_CODE_ESC] = 0x08,
- [Q_KEY_CODE_F1] = 0x07,
- [Q_KEY_CODE_F2] = 0x0f,
- [Q_KEY_CODE_F3] = 0x17,
- [Q_KEY_CODE_F4] = 0x1f,
- [Q_KEY_CODE_F5] = 0x27,
- [Q_KEY_CODE_F6] = 0x2f,
- [Q_KEY_CODE_F7] = 0x37,
- [Q_KEY_CODE_F8] = 0x3f,
- [Q_KEY_CODE_F9] = 0x47,
- [Q_KEY_CODE_F10] = 0x4f,
- [Q_KEY_CODE_F11] = 0x56,
- [Q_KEY_CODE_F12] = 0x5e,
- [Q_KEY_CODE_PRINT] = 0x57,
- [Q_KEY_CODE_SCROLL_LOCK] = 0x5f,
- [Q_KEY_CODE_PAUSE] = 0x62,
- [Q_KEY_CODE_BRACKET_LEFT] = 0x54,
- [Q_KEY_CODE_INSERT] = 0x67,
- [Q_KEY_CODE_HOME] = 0x6e,
- [Q_KEY_CODE_PGUP] = 0x6f,
- [Q_KEY_CODE_DELETE] = 0x64,
- [Q_KEY_CODE_END] = 0x65,
- [Q_KEY_CODE_PGDN] = 0x6d,
- [Q_KEY_CODE_UP] = 0x63,
- [Q_KEY_CODE_LEFT] = 0x61,
- [Q_KEY_CODE_DOWN] = 0x60,
- [Q_KEY_CODE_RIGHT] = 0x6a,
- [Q_KEY_CODE_NUM_LOCK] = 0x76,
- [Q_KEY_CODE_KP_DIVIDE] = 0x4a,
- [Q_KEY_CODE_KP_MULTIPLY] = 0x7e,
- [Q_KEY_CODE_KP_SUBTRACT] = 0x4e,
- [Q_KEY_CODE_KP_ADD] = 0x7c,
- [Q_KEY_CODE_KP_ENTER] = 0x79,
- [Q_KEY_CODE_KP_DECIMAL] = 0x71,
- [Q_KEY_CODE_KP_0] = 0x70,
- [Q_KEY_CODE_KP_1] = 0x69,
- [Q_KEY_CODE_KP_2] = 0x72,
- [Q_KEY_CODE_KP_3] = 0x7a,
- [Q_KEY_CODE_KP_4] = 0x6b,
- [Q_KEY_CODE_KP_5] = 0x73,
- [Q_KEY_CODE_KP_6] = 0x74,
- [Q_KEY_CODE_KP_7] = 0x6c,
- [Q_KEY_CODE_KP_8] = 0x75,
- [Q_KEY_CODE_KP_9] = 0x7d,
- [Q_KEY_CODE_BRACKET_RIGHT] = 0x5b,
- [Q_KEY_CODE_SEMICOLON] = 0x4c,
- [Q_KEY_CODE_APOSTROPHE] = 0x52,
- [Q_KEY_CODE_COMMA] = 0x41,
- [Q_KEY_CODE_DOT] = 0x49,
- [Q_KEY_CODE_SLASH] = 0x4a,
-
- [Q_KEY_CODE_HIRAGANA] = 0x87,
- [Q_KEY_CODE_HENKAN] = 0x86,
- [Q_KEY_CODE_YEN] = 0x5d,
-};
-
static uint8_t translate_table[256] = {
0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58,
0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59,
@@ -595,7 +200,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
PS2KbdState *s = (PS2KbdState *)dev;
InputKeyEvent *key = evt->u.key.data;
int qcode;
- uint16_t keycode;
+ uint16_t keycode = 0;
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
assert(evt->type == INPUT_EVENT_KIND_KEY);
@@ -624,7 +229,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
ps2_put_keycode(s, 0xaa);
}
} else {
- keycode = qcode_to_keycode_set1[qcode];
+ if (qcode < qemu_input_map_qcode2atset1_len)
+ keycode = qemu_input_map_qcode2atset1[qcode];
if (keycode) {
if (keycode & 0xff00) {
ps2_put_keycode(s, keycode >> 8);
@@ -665,7 +271,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
ps2_put_keycode(s, 0x12);
}
} else {
- keycode = qcode_to_keycode_set2[qcode];
+ if (qcode < qemu_input_map_qcode2atset2_len)
+ keycode = qemu_input_map_qcode2atset2[qcode];
if (keycode) {
if (keycode & 0xff00) {
ps2_put_keycode(s, keycode >> 8);
@@ -680,7 +287,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
}
}
} else if (s->scancode_set == 3) {
- keycode = qcode_to_keycode_set3[qcode];
+ if (qcode < qemu_input_map_qcode2atset3_len)
+ keycode = qemu_input_map_qcode2atset3[qcode];
if (keycode) {
/* FIXME: break code should be configured on a key by key basis */
if (!key->down) {
diff --git a/include/ui/input.h b/include/ui/input.h
index aac3b79924..c96f4d566d 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -68,6 +68,15 @@ void qemu_remove_mouse_mode_change_notifier(Notifier *notify);
extern const guint qemu_input_map_linux2qcode_len;
extern const guint16 qemu_input_map_linux2qcode[];
+extern const guint qemu_input_map_qcode2atset1_len;
+extern const guint16 qemu_input_map_qcode2atset1[];
+
+extern const guint qemu_input_map_qcode2atset2_len;
+extern const guint16 qemu_input_map_qcode2atset2[];
+
+extern const guint qemu_input_map_qcode2atset3_len;
+extern const guint16 qemu_input_map_qcode2atset3[];
+
extern const guint qemu_input_map_qcode2linux_len;
extern const guint16 qemu_input_map_qcode2linux[];
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 1ea232b552..09ed31dec4 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -55,6 +55,9 @@ KEYCODEMAP_CSV = ui/keycodemapdb/data/keymaps.csv
KEYCODEMAP_FILES = \
ui/input-keymap-linux2qcode.c \
+ ui/input-keymap-qcode2atset1.c \
+ ui/input-keymap-qcode2atset2.c \
+ ui/input-keymap-qcode2atset3.c \
ui/input-keymap-qcode2linux.c \
ui/input-keymap-qcode2qnum.c \
ui/input-keymap-qnum2qcode.c \
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 65eddf3cfa..9309575f77 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -6,6 +6,9 @@
#include "standard-headers/linux/input.h"
#include "ui/input-keymap-linux2qcode.c"
+#include "ui/input-keymap-qcode2atset1.c"
+#include "ui/input-keymap-qcode2atset2.c"
+#include "ui/input-keymap-qcode2atset3.c"
#include "ui/input-keymap-qcode2linux.c"
#include "ui/input-keymap-qcode2qnum.c"
#include "ui/input-keymap-qnum2qcode.c"
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 08/15] input: convert the adb device to keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (6 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 07/15] input: convert ps2 " Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 09/15] char: convert the escc " Daniel P. Berrange
` (11 subsequent siblings)
19 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
Replace the qcode_to_adb_keycode table with automatically
generated tables.
Missing entries in qcode_to_adb_keycode now fixed:
- Q_KEY_CODE_KP_COMMA -> 0x47
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
hw/input/adb.c | 124 +-------------------------------------
include/hw/input/adb-keys.h | 141 --------------------------------------------
include/ui/input.h | 3 +
ui/Makefile.objs | 1 +
ui/input-keymap.c | 1 +
5 files changed, 7 insertions(+), 263 deletions(-)
delete mode 100644 include/hw/input/adb-keys.h
diff --git a/hw/input/adb.c b/hw/input/adb.c
index 992f5bd1c4..1a3216c31b 100644
--- a/hw/input/adb.c
+++ b/hw/input/adb.c
@@ -25,7 +25,6 @@
#include "hw/hw.h"
#include "hw/input/adb.h"
#include "ui/console.h"
-#include "include/hw/input/adb-keys.h"
#include "ui/input.h"
#include "sysemu/sysemu.h"
@@ -193,125 +192,6 @@ typedef struct ADBKeyboardClass {
DeviceRealize parent_realize;
} ADBKeyboardClass;
-int qcode_to_adb_keycode[] = {
- /* Make sure future additions are automatically set to NO_KEY */
- [0 ... 0xff] = NO_KEY,
-
- [Q_KEY_CODE_SHIFT] = ADB_KEY_LEFT_SHIFT,
- [Q_KEY_CODE_SHIFT_R] = ADB_KEY_RIGHT_SHIFT,
- [Q_KEY_CODE_ALT] = ADB_KEY_LEFT_OPTION,
- [Q_KEY_CODE_ALT_R] = ADB_KEY_RIGHT_OPTION,
- [Q_KEY_CODE_CTRL] = ADB_KEY_LEFT_CONTROL,
- [Q_KEY_CODE_CTRL_R] = ADB_KEY_RIGHT_CONTROL,
- [Q_KEY_CODE_META_L] = ADB_KEY_COMMAND,
- [Q_KEY_CODE_META_R] = ADB_KEY_COMMAND,
- [Q_KEY_CODE_SPC] = ADB_KEY_SPACEBAR,
-
- [Q_KEY_CODE_ESC] = ADB_KEY_ESC,
- [Q_KEY_CODE_1] = ADB_KEY_1,
- [Q_KEY_CODE_2] = ADB_KEY_2,
- [Q_KEY_CODE_3] = ADB_KEY_3,
- [Q_KEY_CODE_4] = ADB_KEY_4,
- [Q_KEY_CODE_5] = ADB_KEY_5,
- [Q_KEY_CODE_6] = ADB_KEY_6,
- [Q_KEY_CODE_7] = ADB_KEY_7,
- [Q_KEY_CODE_8] = ADB_KEY_8,
- [Q_KEY_CODE_9] = ADB_KEY_9,
- [Q_KEY_CODE_0] = ADB_KEY_0,
- [Q_KEY_CODE_MINUS] = ADB_KEY_MINUS,
- [Q_KEY_CODE_EQUAL] = ADB_KEY_EQUAL,
- [Q_KEY_CODE_BACKSPACE] = ADB_KEY_DELETE,
- [Q_KEY_CODE_TAB] = ADB_KEY_TAB,
- [Q_KEY_CODE_Q] = ADB_KEY_Q,
- [Q_KEY_CODE_W] = ADB_KEY_W,
- [Q_KEY_CODE_E] = ADB_KEY_E,
- [Q_KEY_CODE_R] = ADB_KEY_R,
- [Q_KEY_CODE_T] = ADB_KEY_T,
- [Q_KEY_CODE_Y] = ADB_KEY_Y,
- [Q_KEY_CODE_U] = ADB_KEY_U,
- [Q_KEY_CODE_I] = ADB_KEY_I,
- [Q_KEY_CODE_O] = ADB_KEY_O,
- [Q_KEY_CODE_P] = ADB_KEY_P,
- [Q_KEY_CODE_BRACKET_LEFT] = ADB_KEY_LEFT_BRACKET,
- [Q_KEY_CODE_BRACKET_RIGHT] = ADB_KEY_RIGHT_BRACKET,
- [Q_KEY_CODE_RET] = ADB_KEY_RETURN,
- [Q_KEY_CODE_A] = ADB_KEY_A,
- [Q_KEY_CODE_S] = ADB_KEY_S,
- [Q_KEY_CODE_D] = ADB_KEY_D,
- [Q_KEY_CODE_F] = ADB_KEY_F,
- [Q_KEY_CODE_G] = ADB_KEY_G,
- [Q_KEY_CODE_H] = ADB_KEY_H,
- [Q_KEY_CODE_J] = ADB_KEY_J,
- [Q_KEY_CODE_K] = ADB_KEY_K,
- [Q_KEY_CODE_L] = ADB_KEY_L,
- [Q_KEY_CODE_SEMICOLON] = ADB_KEY_SEMICOLON,
- [Q_KEY_CODE_APOSTROPHE] = ADB_KEY_APOSTROPHE,
- [Q_KEY_CODE_GRAVE_ACCENT] = ADB_KEY_GRAVE_ACCENT,
- [Q_KEY_CODE_BACKSLASH] = ADB_KEY_BACKSLASH,
- [Q_KEY_CODE_Z] = ADB_KEY_Z,
- [Q_KEY_CODE_X] = ADB_KEY_X,
- [Q_KEY_CODE_C] = ADB_KEY_C,
- [Q_KEY_CODE_V] = ADB_KEY_V,
- [Q_KEY_CODE_B] = ADB_KEY_B,
- [Q_KEY_CODE_N] = ADB_KEY_N,
- [Q_KEY_CODE_M] = ADB_KEY_M,
- [Q_KEY_CODE_COMMA] = ADB_KEY_COMMA,
- [Q_KEY_CODE_DOT] = ADB_KEY_PERIOD,
- [Q_KEY_CODE_SLASH] = ADB_KEY_FORWARD_SLASH,
- [Q_KEY_CODE_ASTERISK] = ADB_KEY_KP_MULTIPLY,
- [Q_KEY_CODE_CAPS_LOCK] = ADB_KEY_CAPS_LOCK,
-
- [Q_KEY_CODE_F1] = ADB_KEY_F1,
- [Q_KEY_CODE_F2] = ADB_KEY_F2,
- [Q_KEY_CODE_F3] = ADB_KEY_F3,
- [Q_KEY_CODE_F4] = ADB_KEY_F4,
- [Q_KEY_CODE_F5] = ADB_KEY_F5,
- [Q_KEY_CODE_F6] = ADB_KEY_F6,
- [Q_KEY_CODE_F7] = ADB_KEY_F7,
- [Q_KEY_CODE_F8] = ADB_KEY_F8,
- [Q_KEY_CODE_F9] = ADB_KEY_F9,
- [Q_KEY_CODE_F10] = ADB_KEY_F10,
- [Q_KEY_CODE_F11] = ADB_KEY_F11,
- [Q_KEY_CODE_F12] = ADB_KEY_F12,
- [Q_KEY_CODE_PRINT] = ADB_KEY_F13,
- [Q_KEY_CODE_SYSRQ] = ADB_KEY_F13,
- [Q_KEY_CODE_SCROLL_LOCK] = ADB_KEY_F14,
- [Q_KEY_CODE_PAUSE] = ADB_KEY_F15,
-
- [Q_KEY_CODE_NUM_LOCK] = ADB_KEY_KP_CLEAR,
- [Q_KEY_CODE_KP_EQUALS] = ADB_KEY_KP_EQUAL,
- [Q_KEY_CODE_KP_DIVIDE] = ADB_KEY_KP_DIVIDE,
- [Q_KEY_CODE_KP_MULTIPLY] = ADB_KEY_KP_MULTIPLY,
- [Q_KEY_CODE_KP_SUBTRACT] = ADB_KEY_KP_SUBTRACT,
- [Q_KEY_CODE_KP_ADD] = ADB_KEY_KP_PLUS,
- [Q_KEY_CODE_KP_ENTER] = ADB_KEY_KP_ENTER,
- [Q_KEY_CODE_KP_DECIMAL] = ADB_KEY_KP_PERIOD,
- [Q_KEY_CODE_KP_0] = ADB_KEY_KP_0,
- [Q_KEY_CODE_KP_1] = ADB_KEY_KP_1,
- [Q_KEY_CODE_KP_2] = ADB_KEY_KP_2,
- [Q_KEY_CODE_KP_3] = ADB_KEY_KP_3,
- [Q_KEY_CODE_KP_4] = ADB_KEY_KP_4,
- [Q_KEY_CODE_KP_5] = ADB_KEY_KP_5,
- [Q_KEY_CODE_KP_6] = ADB_KEY_KP_6,
- [Q_KEY_CODE_KP_7] = ADB_KEY_KP_7,
- [Q_KEY_CODE_KP_8] = ADB_KEY_KP_8,
- [Q_KEY_CODE_KP_9] = ADB_KEY_KP_9,
-
- [Q_KEY_CODE_UP] = ADB_KEY_UP,
- [Q_KEY_CODE_DOWN] = ADB_KEY_DOWN,
- [Q_KEY_CODE_LEFT] = ADB_KEY_LEFT,
- [Q_KEY_CODE_RIGHT] = ADB_KEY_RIGHT,
-
- [Q_KEY_CODE_HELP] = ADB_KEY_HELP,
- [Q_KEY_CODE_INSERT] = ADB_KEY_HELP,
- [Q_KEY_CODE_DELETE] = ADB_KEY_FORWARD_DELETE,
- [Q_KEY_CODE_HOME] = ADB_KEY_HOME,
- [Q_KEY_CODE_END] = ADB_KEY_END,
- [Q_KEY_CODE_PGUP] = ADB_KEY_PAGE_UP,
- [Q_KEY_CODE_PGDN] = ADB_KEY_PAGE_DOWN,
-
- [Q_KEY_CODE_POWER] = ADB_KEY_POWER
-};
static void adb_kbd_put_keycode(void *opaque, int keycode)
{
@@ -439,11 +319,11 @@ static void adb_keyboard_event(DeviceState *dev, QemuConsole *src,
int qcode, keycode;
qcode = evt->u.key.data->key;
- if (qcode >= ARRAY_SIZE(qcode_to_adb_keycode)) {
+ if (qcode >= qemu_input_map_qcode2adb_len) {
return;
}
/* FIXME: take handler into account when translating qcode */
- keycode = qcode_to_adb_keycode[qcode];
+ keycode = qemu_input_map_qcode2adb[qcode];
if (keycode == NO_KEY) { /* We don't want to send this to the guest */
ADB_DPRINTF("Ignoring NO_KEY\n");
return;
diff --git a/include/hw/input/adb-keys.h b/include/hw/input/adb-keys.h
deleted file mode 100644
index 525fba8a61..0000000000
--- a/include/hw/input/adb-keys.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * QEMU System Emulator
- *
- * Copyright (c) 2016 John Arbuckle
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-/*
- * adb-keys.h
- *
- * Provides an enum of all the Macintosh keycodes.
- * Additional information: http://www.archive.org/stream/apple-guide-macintosh-family-hardware/Apple_Guide_to_the_Macintosh_Family_Hardware_2e#page/n345/mode/2up
- * page 308
- */
-
-#ifndef ADB_KEYS_H
-#define ADB_KEYS_H
-
-enum {
- ADB_KEY_A = 0x00,
- ADB_KEY_B = 0x0b,
- ADB_KEY_C = 0x08,
- ADB_KEY_D = 0x02,
- ADB_KEY_E = 0x0e,
- ADB_KEY_F = 0x03,
- ADB_KEY_G = 0x05,
- ADB_KEY_H = 0x04,
- ADB_KEY_I = 0x22,
- ADB_KEY_J = 0x26,
- ADB_KEY_K = 0x28,
- ADB_KEY_L = 0x25,
- ADB_KEY_M = 0x2e,
- ADB_KEY_N = 0x2d,
- ADB_KEY_O = 0x1f,
- ADB_KEY_P = 0x23,
- ADB_KEY_Q = 0x0c,
- ADB_KEY_R = 0x0f,
- ADB_KEY_S = 0x01,
- ADB_KEY_T = 0x11,
- ADB_KEY_U = 0x20,
- ADB_KEY_V = 0x09,
- ADB_KEY_W = 0x0d,
- ADB_KEY_X = 0x07,
- ADB_KEY_Y = 0x10,
- ADB_KEY_Z = 0x06,
-
- ADB_KEY_0 = 0x1d,
- ADB_KEY_1 = 0x12,
- ADB_KEY_2 = 0x13,
- ADB_KEY_3 = 0x14,
- ADB_KEY_4 = 0x15,
- ADB_KEY_5 = 0x17,
- ADB_KEY_6 = 0x16,
- ADB_KEY_7 = 0x1a,
- ADB_KEY_8 = 0x1c,
- ADB_KEY_9 = 0x19,
-
- ADB_KEY_GRAVE_ACCENT = 0x32,
- ADB_KEY_MINUS = 0x1b,
- ADB_KEY_EQUAL = 0x18,
- ADB_KEY_DELETE = 0x33,
- ADB_KEY_CAPS_LOCK = 0x39,
- ADB_KEY_TAB = 0x30,
- ADB_KEY_RETURN = 0x24,
- ADB_KEY_LEFT_BRACKET = 0x21,
- ADB_KEY_RIGHT_BRACKET = 0x1e,
- ADB_KEY_BACKSLASH = 0x2a,
- ADB_KEY_SEMICOLON = 0x29,
- ADB_KEY_APOSTROPHE = 0x27,
- ADB_KEY_COMMA = 0x2b,
- ADB_KEY_PERIOD = 0x2f,
- ADB_KEY_FORWARD_SLASH = 0x2c,
- ADB_KEY_LEFT_SHIFT = 0x38,
- ADB_KEY_RIGHT_SHIFT = 0x7b,
- ADB_KEY_SPACEBAR = 0x31,
- ADB_KEY_LEFT_CONTROL = 0x36,
- ADB_KEY_RIGHT_CONTROL = 0x7d,
- ADB_KEY_LEFT_OPTION = 0x3a,
- ADB_KEY_RIGHT_OPTION = 0x7c,
- ADB_KEY_COMMAND = 0x37,
-
- ADB_KEY_KP_0 = 0x52,
- ADB_KEY_KP_1 = 0x53,
- ADB_KEY_KP_2 = 0x54,
- ADB_KEY_KP_3 = 0x55,
- ADB_KEY_KP_4 = 0x56,
- ADB_KEY_KP_5 = 0x57,
- ADB_KEY_KP_6 = 0x58,
- ADB_KEY_KP_7 = 0x59,
- ADB_KEY_KP_8 = 0x5b,
- ADB_KEY_KP_9 = 0x5c,
- ADB_KEY_KP_PERIOD = 0x41,
- ADB_KEY_KP_ENTER = 0x4c,
- ADB_KEY_KP_PLUS = 0x45,
- ADB_KEY_KP_SUBTRACT = 0x4e,
- ADB_KEY_KP_MULTIPLY = 0x43,
- ADB_KEY_KP_DIVIDE = 0x4b,
- ADB_KEY_KP_EQUAL = 0x51,
- ADB_KEY_KP_CLEAR = 0x47,
-
- ADB_KEY_UP = 0x3e,
- ADB_KEY_DOWN = 0x3d,
- ADB_KEY_LEFT = 0x3b,
- ADB_KEY_RIGHT = 0x3c,
-
- ADB_KEY_HELP = 0x72,
- ADB_KEY_HOME = 0x73,
- ADB_KEY_PAGE_UP = 0x74,
- ADB_KEY_PAGE_DOWN = 0x79,
- ADB_KEY_END = 0x77,
- ADB_KEY_FORWARD_DELETE = 0x75,
-
- ADB_KEY_ESC = 0x35,
- ADB_KEY_F1 = 0x7a,
- ADB_KEY_F2 = 0x78,
- ADB_KEY_F3 = 0x63,
- ADB_KEY_F4 = 0x76,
- ADB_KEY_F5 = 0x60,
- ADB_KEY_F6 = 0x61,
- ADB_KEY_F7 = 0x62,
- ADB_KEY_F8 = 0x64,
- ADB_KEY_F9 = 0x65,
- ADB_KEY_F10 = 0x6d,
- ADB_KEY_F11 = 0x67,
- ADB_KEY_F12 = 0x6f,
- ADB_KEY_F13 = 0x69,
- ADB_KEY_F14 = 0x6b,
- ADB_KEY_F15 = 0x71,
-
- ADB_KEY_VOLUME_UP = 0x48,
- ADB_KEY_VOLUME_DOWN = 0x49,
- ADB_KEY_VOLUME_MUTE = 0x4a,
- ADB_KEY_POWER = 0x7f7f
-};
-
-/* Could not find the value for this key. */
-/* #define ADB_KEY_EJECT */
-
-#endif /* ADB_KEYS_H */
diff --git a/include/ui/input.h b/include/ui/input.h
index c96f4d566d..0400f88c5d 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -68,6 +68,9 @@ void qemu_remove_mouse_mode_change_notifier(Notifier *notify);
extern const guint qemu_input_map_linux2qcode_len;
extern const guint16 qemu_input_map_linux2qcode[];
+extern const guint qemu_input_map_qcode2adb_len;
+extern const guint16 qemu_input_map_qcode2adb[];
+
extern const guint qemu_input_map_qcode2atset1_len;
extern const guint16 qemu_input_map_qcode2atset1[];
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 09ed31dec4..7123f593ab 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -55,6 +55,7 @@ KEYCODEMAP_CSV = ui/keycodemapdb/data/keymaps.csv
KEYCODEMAP_FILES = \
ui/input-keymap-linux2qcode.c \
+ ui/input-keymap-qcode2adb.c \
ui/input-keymap-qcode2atset1.c \
ui/input-keymap-qcode2atset2.c \
ui/input-keymap-qcode2atset3.c \
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 9309575f77..afe6def002 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -6,6 +6,7 @@
#include "standard-headers/linux/input.h"
#include "ui/input-keymap-linux2qcode.c"
+#include "ui/input-keymap-qcode2adb.c"
#include "ui/input-keymap-qcode2atset1.c"
#include "ui/input-keymap-qcode2atset2.c"
#include "ui/input-keymap-qcode2atset3.c"
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 09/15] char: convert the escc device to keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (7 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 08/15] input: convert the adb " Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 10/15] ui: convert cocoa frontend " Daniel P. Berrange
` (10 subsequent siblings)
19 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
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 <berrange@redhat.com>
---
hw/char/escc.c | 126 +++--------------------------------------------------
include/ui/input.h | 3 ++
ui/Makefile.objs | 1 +
ui/input-keymap.c | 1 +
4 files changed, 10 insertions(+), 121 deletions(-)
diff --git a/hw/char/escc.c b/hw/char/escc.c
index 5af7f0cddf..3cacdb5102 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -717,126 +717,6 @@ MemoryRegion *escc_init(hwaddr base, qemu_irq irqA, qemu_irq irqB,
return &d->mmio;
}
-static const uint8_t qcode_to_keycode[Q_KEY_CODE__MAX] = {
- [Q_KEY_CODE_SHIFT] = 99,
- [Q_KEY_CODE_SHIFT_R] = 110,
- [Q_KEY_CODE_ALT] = 19,
- [Q_KEY_CODE_ALT_R] = 13,
- [Q_KEY_CODE_CTRL] = 76,
- [Q_KEY_CODE_CTRL_R] = 76,
- [Q_KEY_CODE_ESC] = 29,
- [Q_KEY_CODE_1] = 30,
- [Q_KEY_CODE_2] = 31,
- [Q_KEY_CODE_3] = 32,
- [Q_KEY_CODE_4] = 33,
- [Q_KEY_CODE_5] = 34,
- [Q_KEY_CODE_6] = 35,
- [Q_KEY_CODE_7] = 36,
- [Q_KEY_CODE_8] = 37,
- [Q_KEY_CODE_9] = 38,
- [Q_KEY_CODE_0] = 39,
- [Q_KEY_CODE_MINUS] = 40,
- [Q_KEY_CODE_EQUAL] = 41,
- [Q_KEY_CODE_BACKSPACE] = 43,
- [Q_KEY_CODE_TAB] = 53,
- [Q_KEY_CODE_Q] = 54,
- [Q_KEY_CODE_W] = 55,
- [Q_KEY_CODE_E] = 56,
- [Q_KEY_CODE_R] = 57,
- [Q_KEY_CODE_T] = 58,
- [Q_KEY_CODE_Y] = 59,
- [Q_KEY_CODE_U] = 60,
- [Q_KEY_CODE_I] = 61,
- [Q_KEY_CODE_O] = 62,
- [Q_KEY_CODE_P] = 63,
- [Q_KEY_CODE_BRACKET_LEFT] = 64,
- [Q_KEY_CODE_BRACKET_RIGHT] = 65,
- [Q_KEY_CODE_RET] = 89,
- [Q_KEY_CODE_A] = 77,
- [Q_KEY_CODE_S] = 78,
- [Q_KEY_CODE_D] = 79,
- [Q_KEY_CODE_F] = 80,
- [Q_KEY_CODE_G] = 81,
- [Q_KEY_CODE_H] = 82,
- [Q_KEY_CODE_J] = 83,
- [Q_KEY_CODE_K] = 84,
- [Q_KEY_CODE_L] = 85,
- [Q_KEY_CODE_SEMICOLON] = 86,
- [Q_KEY_CODE_APOSTROPHE] = 87,
- [Q_KEY_CODE_GRAVE_ACCENT] = 42,
- [Q_KEY_CODE_BACKSLASH] = 88,
- [Q_KEY_CODE_Z] = 100,
- [Q_KEY_CODE_X] = 101,
- [Q_KEY_CODE_C] = 102,
- [Q_KEY_CODE_V] = 103,
- [Q_KEY_CODE_B] = 104,
- [Q_KEY_CODE_N] = 105,
- [Q_KEY_CODE_M] = 106,
- [Q_KEY_CODE_COMMA] = 107,
- [Q_KEY_CODE_DOT] = 108,
- [Q_KEY_CODE_SLASH] = 109,
- [Q_KEY_CODE_ASTERISK] = 47,
- [Q_KEY_CODE_SPC] = 121,
- [Q_KEY_CODE_CAPS_LOCK] = 119,
- [Q_KEY_CODE_F1] = 5,
- [Q_KEY_CODE_F2] = 6,
- [Q_KEY_CODE_F3] = 8,
- [Q_KEY_CODE_F4] = 10,
- [Q_KEY_CODE_F5] = 12,
- [Q_KEY_CODE_F6] = 14,
- [Q_KEY_CODE_F7] = 16,
- [Q_KEY_CODE_F8] = 17,
- [Q_KEY_CODE_F9] = 18,
- [Q_KEY_CODE_F10] = 7,
- [Q_KEY_CODE_NUM_LOCK] = 98,
- [Q_KEY_CODE_SCROLL_LOCK] = 23,
- [Q_KEY_CODE_KP_DIVIDE] = 46,
- [Q_KEY_CODE_KP_MULTIPLY] = 47,
- [Q_KEY_CODE_KP_SUBTRACT] = 71,
- [Q_KEY_CODE_KP_ADD] = 125,
- [Q_KEY_CODE_KP_ENTER] = 90,
- [Q_KEY_CODE_KP_DECIMAL] = 50,
- [Q_KEY_CODE_KP_0] = 94,
- [Q_KEY_CODE_KP_1] = 112,
- [Q_KEY_CODE_KP_2] = 113,
- [Q_KEY_CODE_KP_3] = 114,
- [Q_KEY_CODE_KP_4] = 91,
- [Q_KEY_CODE_KP_5] = 92,
- [Q_KEY_CODE_KP_6] = 93,
- [Q_KEY_CODE_KP_7] = 68,
- [Q_KEY_CODE_KP_8] = 69,
- [Q_KEY_CODE_KP_9] = 70,
- [Q_KEY_CODE_LESS] = 124,
- [Q_KEY_CODE_F11] = 9,
- [Q_KEY_CODE_F12] = 11,
- [Q_KEY_CODE_HOME] = 52,
- [Q_KEY_CODE_PGUP] = 96,
- [Q_KEY_CODE_PGDN] = 123,
- [Q_KEY_CODE_END] = 74,
- [Q_KEY_CODE_LEFT] = 24,
- [Q_KEY_CODE_UP] = 20,
- [Q_KEY_CODE_DOWN] = 27,
- [Q_KEY_CODE_RIGHT] = 28,
- [Q_KEY_CODE_INSERT] = 44,
- [Q_KEY_CODE_DELETE] = 66,
- [Q_KEY_CODE_STOP] = 1,
- [Q_KEY_CODE_AGAIN] = 3,
- [Q_KEY_CODE_PROPS] = 25,
- [Q_KEY_CODE_UNDO] = 26,
- [Q_KEY_CODE_FRONT] = 49,
- [Q_KEY_CODE_COPY] = 51,
- [Q_KEY_CODE_OPEN] = 72,
- [Q_KEY_CODE_PASTE] = 73,
- [Q_KEY_CODE_FIND] = 95,
- [Q_KEY_CODE_CUT] = 97,
- [Q_KEY_CODE_LF] = 111,
- [Q_KEY_CODE_HELP] = 118,
- [Q_KEY_CODE_META_L] = 120,
- [Q_KEY_CODE_META_R] = 122,
- [Q_KEY_CODE_COMPOSE] = 67,
- [Q_KEY_CODE_PRINT] = 22,
- [Q_KEY_CODE_SYSRQ] = 21,
-};
static void sunkbd_handle_event(DeviceState *dev, QemuConsole *src,
InputEvent *evt)
@@ -879,7 +759,11 @@ static void sunkbd_handle_event(DeviceState *dev, QemuConsole *src,
}
}
- keycode = qcode_to_keycode[qcode];
+ if (qcode > qemu_input_map_qcode2sun_len) {
+ return;
+ }
+
+ keycode = qemu_input_map_qcode2sun[qcode];
if (!key->down) {
keycode |= 0x80;
}
diff --git a/include/ui/input.h b/include/ui/input.h
index 0400f88c5d..69ffff522b 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -86,6 +86,9 @@ extern const guint16 qemu_input_map_qcode2linux[];
extern const guint qemu_input_map_qcode2qnum_len;
extern const guint16 qemu_input_map_qcode2qnum[];
+extern const guint qemu_input_map_qcode2sun_len;
+extern const guint16 qemu_input_map_qcode2sun[];
+
extern const guint qemu_input_map_qnum2qcode_len;
extern const guint16 qemu_input_map_qnum2qcode[];
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 7123f593ab..935a54c109 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -61,6 +61,7 @@ KEYCODEMAP_FILES = \
ui/input-keymap-qcode2atset3.c \
ui/input-keymap-qcode2linux.c \
ui/input-keymap-qcode2qnum.c \
+ ui/input-keymap-qcode2sun.c \
ui/input-keymap-qnum2qcode.c \
$(NULL)
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index afe6def002..05a097b97f 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -12,6 +12,7 @@
#include "ui/input-keymap-qcode2atset3.c"
#include "ui/input-keymap-qcode2linux.c"
#include "ui/input-keymap-qcode2qnum.c"
+#include "ui/input-keymap-qcode2sun.c"
#include "ui/input-keymap-qnum2qcode.c"
int qemu_input_linux_to_qcode(unsigned int lnx)
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 10/15] ui: convert cocoa frontend to keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (8 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 09/15] char: convert the escc " Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 11/15] ui: convert the SDL2 " Daniel P. Berrange
` (9 subsequent siblings)
19 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
Replace the mac_to_qkeycode_map table with automatically
generated table.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
include/ui/input.h | 3 ++
ui/Makefile.objs | 1 +
ui/cocoa.m | 129 +----------------------------------------------------
ui/input-keymap.c | 1 +
4 files changed, 7 insertions(+), 127 deletions(-)
diff --git a/include/ui/input.h b/include/ui/input.h
index 69ffff522b..595e596ef3 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -68,6 +68,9 @@ void qemu_remove_mouse_mode_change_notifier(Notifier *notify);
extern const guint qemu_input_map_linux2qcode_len;
extern const guint16 qemu_input_map_linux2qcode[];
+extern const guint qemu_input_map_osx2qcode_len;
+extern const guint16 qemu_input_map_osx2qcode[];
+
extern const guint qemu_input_map_qcode2adb_len;
extern const guint16 qemu_input_map_qcode2adb[];
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 935a54c109..ce9c4380ae 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -55,6 +55,7 @@ KEYCODEMAP_CSV = ui/keycodemapdb/data/keymaps.csv
KEYCODEMAP_FILES = \
ui/input-keymap-linux2qcode.c \
+ ui/input-keymap-osx2qcode.c \
ui/input-keymap-qcode2adb.c \
ui/input-keymap-qcode2atset1.c \
ui/input-keymap-qcode2atset2.c \
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 93e56d0518..97a0001cc5 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -106,139 +106,14 @@ bool stretch_video;
NSTextField *pauseLabel;
NSArray * supportedImageFileTypes;
-// Mac to QKeyCode conversion
-const int mac_to_qkeycode_map[] = {
- [kVK_ANSI_A] = Q_KEY_CODE_A,
- [kVK_ANSI_B] = Q_KEY_CODE_B,
- [kVK_ANSI_C] = Q_KEY_CODE_C,
- [kVK_ANSI_D] = Q_KEY_CODE_D,
- [kVK_ANSI_E] = Q_KEY_CODE_E,
- [kVK_ANSI_F] = Q_KEY_CODE_F,
- [kVK_ANSI_G] = Q_KEY_CODE_G,
- [kVK_ANSI_H] = Q_KEY_CODE_H,
- [kVK_ANSI_I] = Q_KEY_CODE_I,
- [kVK_ANSI_J] = Q_KEY_CODE_J,
- [kVK_ANSI_K] = Q_KEY_CODE_K,
- [kVK_ANSI_L] = Q_KEY_CODE_L,
- [kVK_ANSI_M] = Q_KEY_CODE_M,
- [kVK_ANSI_N] = Q_KEY_CODE_N,
- [kVK_ANSI_O] = Q_KEY_CODE_O,
- [kVK_ANSI_P] = Q_KEY_CODE_P,
- [kVK_ANSI_Q] = Q_KEY_CODE_Q,
- [kVK_ANSI_R] = Q_KEY_CODE_R,
- [kVK_ANSI_S] = Q_KEY_CODE_S,
- [kVK_ANSI_T] = Q_KEY_CODE_T,
- [kVK_ANSI_U] = Q_KEY_CODE_U,
- [kVK_ANSI_V] = Q_KEY_CODE_V,
- [kVK_ANSI_W] = Q_KEY_CODE_W,
- [kVK_ANSI_X] = Q_KEY_CODE_X,
- [kVK_ANSI_Y] = Q_KEY_CODE_Y,
- [kVK_ANSI_Z] = Q_KEY_CODE_Z,
-
- [kVK_ANSI_0] = Q_KEY_CODE_0,
- [kVK_ANSI_1] = Q_KEY_CODE_1,
- [kVK_ANSI_2] = Q_KEY_CODE_2,
- [kVK_ANSI_3] = Q_KEY_CODE_3,
- [kVK_ANSI_4] = Q_KEY_CODE_4,
- [kVK_ANSI_5] = Q_KEY_CODE_5,
- [kVK_ANSI_6] = Q_KEY_CODE_6,
- [kVK_ANSI_7] = Q_KEY_CODE_7,
- [kVK_ANSI_8] = Q_KEY_CODE_8,
- [kVK_ANSI_9] = Q_KEY_CODE_9,
-
- [kVK_ANSI_Grave] = Q_KEY_CODE_GRAVE_ACCENT,
- [kVK_ANSI_Minus] = Q_KEY_CODE_MINUS,
- [kVK_ANSI_Equal] = Q_KEY_CODE_EQUAL,
- [kVK_Delete] = Q_KEY_CODE_BACKSPACE,
- [kVK_CapsLock] = Q_KEY_CODE_CAPS_LOCK,
- [kVK_Tab] = Q_KEY_CODE_TAB,
- [kVK_Return] = Q_KEY_CODE_RET,
- [kVK_ANSI_LeftBracket] = Q_KEY_CODE_BRACKET_LEFT,
- [kVK_ANSI_RightBracket] = Q_KEY_CODE_BRACKET_RIGHT,
- [kVK_ANSI_Backslash] = Q_KEY_CODE_BACKSLASH,
- [kVK_ANSI_Semicolon] = Q_KEY_CODE_SEMICOLON,
- [kVK_ANSI_Quote] = Q_KEY_CODE_APOSTROPHE,
- [kVK_ANSI_Comma] = Q_KEY_CODE_COMMA,
- [kVK_ANSI_Period] = Q_KEY_CODE_DOT,
- [kVK_ANSI_Slash] = Q_KEY_CODE_SLASH,
- [kVK_Shift] = Q_KEY_CODE_SHIFT,
- [kVK_RightShift] = Q_KEY_CODE_SHIFT_R,
- [kVK_Control] = Q_KEY_CODE_CTRL,
- [kVK_RightControl] = Q_KEY_CODE_CTRL_R,
- [kVK_Option] = Q_KEY_CODE_ALT,
- [kVK_RightOption] = Q_KEY_CODE_ALT_R,
- [kVK_Command] = Q_KEY_CODE_META_L,
- [0x36] = Q_KEY_CODE_META_R, /* There is no kVK_RightCommand */
- [kVK_Space] = Q_KEY_CODE_SPC,
-
- [kVK_ANSI_Keypad0] = Q_KEY_CODE_KP_0,
- [kVK_ANSI_Keypad1] = Q_KEY_CODE_KP_1,
- [kVK_ANSI_Keypad2] = Q_KEY_CODE_KP_2,
- [kVK_ANSI_Keypad3] = Q_KEY_CODE_KP_3,
- [kVK_ANSI_Keypad4] = Q_KEY_CODE_KP_4,
- [kVK_ANSI_Keypad5] = Q_KEY_CODE_KP_5,
- [kVK_ANSI_Keypad6] = Q_KEY_CODE_KP_6,
- [kVK_ANSI_Keypad7] = Q_KEY_CODE_KP_7,
- [kVK_ANSI_Keypad8] = Q_KEY_CODE_KP_8,
- [kVK_ANSI_Keypad9] = Q_KEY_CODE_KP_9,
- [kVK_ANSI_KeypadDecimal] = Q_KEY_CODE_KP_DECIMAL,
- [kVK_ANSI_KeypadEnter] = Q_KEY_CODE_KP_ENTER,
- [kVK_ANSI_KeypadPlus] = Q_KEY_CODE_KP_ADD,
- [kVK_ANSI_KeypadMinus] = Q_KEY_CODE_KP_SUBTRACT,
- [kVK_ANSI_KeypadMultiply] = Q_KEY_CODE_KP_MULTIPLY,
- [kVK_ANSI_KeypadDivide] = Q_KEY_CODE_KP_DIVIDE,
- [kVK_ANSI_KeypadEquals] = Q_KEY_CODE_KP_EQUALS,
- [kVK_ANSI_KeypadClear] = Q_KEY_CODE_NUM_LOCK,
-
- [kVK_UpArrow] = Q_KEY_CODE_UP,
- [kVK_DownArrow] = Q_KEY_CODE_DOWN,
- [kVK_LeftArrow] = Q_KEY_CODE_LEFT,
- [kVK_RightArrow] = Q_KEY_CODE_RIGHT,
-
- [kVK_Help] = Q_KEY_CODE_INSERT,
- [kVK_Home] = Q_KEY_CODE_HOME,
- [kVK_PageUp] = Q_KEY_CODE_PGUP,
- [kVK_PageDown] = Q_KEY_CODE_PGDN,
- [kVK_End] = Q_KEY_CODE_END,
- [kVK_ForwardDelete] = Q_KEY_CODE_DELETE,
-
- [kVK_Escape] = Q_KEY_CODE_ESC,
-
- /* The Power key can't be used directly because the operating system uses
- * it. This key can be emulated by using it in place of another key such as
- * F1. Don't forget to disable the real key binding.
- */
- /* [kVK_F1] = Q_KEY_CODE_POWER, */
-
- [kVK_F1] = Q_KEY_CODE_F1,
- [kVK_F2] = Q_KEY_CODE_F2,
- [kVK_F3] = Q_KEY_CODE_F3,
- [kVK_F4] = Q_KEY_CODE_F4,
- [kVK_F5] = Q_KEY_CODE_F5,
- [kVK_F6] = Q_KEY_CODE_F6,
- [kVK_F7] = Q_KEY_CODE_F7,
- [kVK_F8] = Q_KEY_CODE_F8,
- [kVK_F9] = Q_KEY_CODE_F9,
- [kVK_F10] = Q_KEY_CODE_F10,
- [kVK_F11] = Q_KEY_CODE_F11,
- [kVK_F12] = Q_KEY_CODE_F12,
- [kVK_F13] = Q_KEY_CODE_PRINT,
- [kVK_F14] = Q_KEY_CODE_SCROLL_LOCK,
- [kVK_F15] = Q_KEY_CODE_PAUSE,
-
- /*
- * The eject and volume keys can't be used here because they are handled at
- * a lower level than what an Application can see.
- */
-};
static int cocoa_keycode_to_qemu(int keycode)
{
- if (ARRAY_SIZE(mac_to_qkeycode_map) <= keycode) {
+ if (keycode >= qemu_input_map_osx2qcode_len) {
fprintf(stderr, "(cocoa) warning unknown keycode 0x%x\n", keycode);
return 0;
}
- return mac_to_qkeycode_map[keycode];
+ return qemu_input_map_osx2qcode[keycode];
}
/* Displays an alert dialog box with the specified message */
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 05a097b97f..e575348cb2 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -6,6 +6,7 @@
#include "standard-headers/linux/input.h"
#include "ui/input-keymap-linux2qcode.c"
+#include "ui/input-keymap-osx2qcode.c"
#include "ui/input-keymap-qcode2adb.c"
#include "ui/input-keymap-qcode2atset1.c"
#include "ui/input-keymap-qcode2atset2.c"
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 11/15] ui: convert the SDL2 frontend to keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (9 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 10/15] ui: convert cocoa frontend " Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 12/15] ui: convert GTK and SDL1 frontends " Daniel P. Berrange
` (8 subsequent siblings)
19 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
The SDL2 scancodes are conveniently identical to the USB
scancodes. Replace the sdl2_scancode_to_qcode table with
an automatically generated table.
Missing entries in sdl2_scancode_to_qcode now fixed:
- 0x32 -> Q_KEY_CODE_BACKSLASH
- 0x66 -> Q_KEY_CODE_POWER
- 0x67 -> Q_KEY_CODE_KP_EQUALS
- 0x74 -> Q_KEY_CODE_OPEN
- 0x77 -> Q_KEY_CODE_FRONT
- 0x7f -> Q_KEY_CODE_AUDIOMUTE
- 0x80 -> Q_KEY_CODE_VOLUMEUP
- 0x81 -> Q_KEY_CODE_VOLUMEDOWN
- 0x85 -> Q_KEY_CODE_KP_COMMA
- 0x87 -> Q_KEY_CODE_RO
- 0x89 -> Q_KEY_CODE_YEN
- 0x8a -> Q_KEY_CODE_HENKAN
- 0x93 -> Q_KEY_CODE_HIRAGANA
- 0xe8 -> Q_KEY_CODE_AUDIOPLAY
- 0xe9 -> Q_KEY_CODE_AUDIOSTOP
- 0xea -> Q_KEY_CODE_AUDIOPREV
- 0xeb -> Q_KEY_CODE_AUDIONEXT
- 0xed -> Q_KEY_CODE_VOLUMEUP
- 0xee -> Q_KEY_CODE_VOLUMEDOWN
- 0xef -> Q_KEY_CODE_AUDIOMUTE
- 0xf1 -> Q_KEY_CODE_AC_BACK
- 0xf2 -> Q_KEY_CODE_AC_FORWARD
- 0xf3 -> Q_KEY_CODE_STOP
- 0xf4 -> Q_KEY_CODE_FIND
- 0xf8 -> Q_KEY_CODE_SLEEP
- 0xfa -> Q_KEY_CODE_AC_REFRESH
- 0xfb -> Q_KEY_CODE_CALCULATOR
And some mistakes corrected:
- 0x65 -> Q_KEY_CODE_COMPOSE, not duplicating Q_KEY_CODE_MENU
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
include/ui/input.h | 3 +
ui/Makefile.objs | 1 +
ui/input-keymap.c | 1 +
ui/sdl2-input.c | 14 ++-
ui/sdl2-keymap.h | 267 -----------------------------------------------------
5 files changed, 14 insertions(+), 272 deletions(-)
delete mode 100644 ui/sdl2-keymap.h
diff --git a/include/ui/input.h b/include/ui/input.h
index 595e596ef3..11bf94aacf 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -95,4 +95,7 @@ extern const guint16 qemu_input_map_qcode2sun[];
extern const guint qemu_input_map_qnum2qcode_len;
extern const guint16 qemu_input_map_qnum2qcode[];
+extern const guint qemu_input_map_usb2qcode_len;
+extern const guint16 qemu_input_map_usb2qcode[];
+
#endif /* INPUT_H */
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index ce9c4380ae..cd2bf1e790 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -64,6 +64,7 @@ KEYCODEMAP_FILES = \
ui/input-keymap-qcode2qnum.c \
ui/input-keymap-qcode2sun.c \
ui/input-keymap-qnum2qcode.c \
+ ui/input-keymap-usb2qcode.c \
$(NULL)
GENERATED_FILES += $(KEYCODEMAP_FILES)
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index e575348cb2..c7a9c08bdb 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -15,6 +15,7 @@
#include "ui/input-keymap-qcode2qnum.c"
#include "ui/input-keymap-qcode2sun.c"
#include "ui/input-keymap-qnum2qcode.c"
+#include "ui/input-keymap-usb2qcode.c"
int qemu_input_linux_to_qcode(unsigned int lnx)
{
diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c
index 6e315ae800..f0a99ffd73 100644
--- a/ui/sdl2-input.c
+++ b/ui/sdl2-input.c
@@ -30,8 +30,6 @@
#include "ui/sdl2.h"
#include "sysemu/sysemu.h"
-#include "sdl2-keymap.h"
-
static uint8_t modifiers_state[SDL_NUM_SCANCODES];
void sdl2_reset_keys(struct sdl2_console *scon)
@@ -39,9 +37,9 @@ void sdl2_reset_keys(struct sdl2_console *scon)
QemuConsole *con = scon ? scon->dcl.con : NULL;
int i;
- for (i = 0; i < SDL_NUM_SCANCODES; i++) {
+ for (i = 0; i < SDL_NUM_SCANCODES && i < qemu_input_map_usb2qcode_len ; i++) {
if (modifiers_state[i]) {
- int qcode = sdl2_scancode_to_qcode[i];
+ int qcode = qemu_input_map_usb2qcode[i];
qemu_input_event_send_key_qcode(con, qcode, false);
modifiers_state[i] = 0;
}
@@ -51,9 +49,15 @@ void sdl2_reset_keys(struct sdl2_console *scon)
void sdl2_process_key(struct sdl2_console *scon,
SDL_KeyboardEvent *ev)
{
- int qcode = sdl2_scancode_to_qcode[ev->keysym.scancode];
+ int qcode;
QemuConsole *con = scon ? scon->dcl.con : NULL;
+ if (ev->keysym.scancode >= qemu_input_map_usb2qcode_len) {
+ return;
+ }
+
+ qcode = qemu_input_map_usb2qcode[ev->keysym.scancode];
+
if (!qemu_console_is_graphic(con)) {
if (ev->type == SDL_KEYDOWN) {
switch (ev->keysym.scancode) {
diff --git a/ui/sdl2-keymap.h b/ui/sdl2-keymap.h
deleted file mode 100644
index cbedaa477d..0000000000
--- a/ui/sdl2-keymap.h
+++ /dev/null
@@ -1,267 +0,0 @@
-
-/* map SDL2 scancodes to QKeyCode */
-
-static const int sdl2_scancode_to_qcode[SDL_NUM_SCANCODES] = {
- [SDL_SCANCODE_A] = Q_KEY_CODE_A,
- [SDL_SCANCODE_B] = Q_KEY_CODE_B,
- [SDL_SCANCODE_C] = Q_KEY_CODE_C,
- [SDL_SCANCODE_D] = Q_KEY_CODE_D,
- [SDL_SCANCODE_E] = Q_KEY_CODE_E,
- [SDL_SCANCODE_F] = Q_KEY_CODE_F,
- [SDL_SCANCODE_G] = Q_KEY_CODE_G,
- [SDL_SCANCODE_H] = Q_KEY_CODE_H,
- [SDL_SCANCODE_I] = Q_KEY_CODE_I,
- [SDL_SCANCODE_J] = Q_KEY_CODE_J,
- [SDL_SCANCODE_K] = Q_KEY_CODE_K,
- [SDL_SCANCODE_L] = Q_KEY_CODE_L,
- [SDL_SCANCODE_M] = Q_KEY_CODE_M,
- [SDL_SCANCODE_N] = Q_KEY_CODE_N,
- [SDL_SCANCODE_O] = Q_KEY_CODE_O,
- [SDL_SCANCODE_P] = Q_KEY_CODE_P,
- [SDL_SCANCODE_Q] = Q_KEY_CODE_Q,
- [SDL_SCANCODE_R] = Q_KEY_CODE_R,
- [SDL_SCANCODE_S] = Q_KEY_CODE_S,
- [SDL_SCANCODE_T] = Q_KEY_CODE_T,
- [SDL_SCANCODE_U] = Q_KEY_CODE_U,
- [SDL_SCANCODE_V] = Q_KEY_CODE_V,
- [SDL_SCANCODE_W] = Q_KEY_CODE_W,
- [SDL_SCANCODE_X] = Q_KEY_CODE_X,
- [SDL_SCANCODE_Y] = Q_KEY_CODE_Y,
- [SDL_SCANCODE_Z] = Q_KEY_CODE_Z,
-
- [SDL_SCANCODE_1] = Q_KEY_CODE_1,
- [SDL_SCANCODE_2] = Q_KEY_CODE_2,
- [SDL_SCANCODE_3] = Q_KEY_CODE_3,
- [SDL_SCANCODE_4] = Q_KEY_CODE_4,
- [SDL_SCANCODE_5] = Q_KEY_CODE_5,
- [SDL_SCANCODE_6] = Q_KEY_CODE_6,
- [SDL_SCANCODE_7] = Q_KEY_CODE_7,
- [SDL_SCANCODE_8] = Q_KEY_CODE_8,
- [SDL_SCANCODE_9] = Q_KEY_CODE_9,
- [SDL_SCANCODE_0] = Q_KEY_CODE_0,
-
- [SDL_SCANCODE_RETURN] = Q_KEY_CODE_RET,
- [SDL_SCANCODE_ESCAPE] = Q_KEY_CODE_ESC,
- [SDL_SCANCODE_BACKSPACE] = Q_KEY_CODE_BACKSPACE,
- [SDL_SCANCODE_TAB] = Q_KEY_CODE_TAB,
- [SDL_SCANCODE_SPACE] = Q_KEY_CODE_SPC,
- [SDL_SCANCODE_MINUS] = Q_KEY_CODE_MINUS,
- [SDL_SCANCODE_EQUALS] = Q_KEY_CODE_EQUAL,
- [SDL_SCANCODE_LEFTBRACKET] = Q_KEY_CODE_BRACKET_LEFT,
- [SDL_SCANCODE_RIGHTBRACKET] = Q_KEY_CODE_BRACKET_RIGHT,
- [SDL_SCANCODE_BACKSLASH] = Q_KEY_CODE_BACKSLASH,
-#if 0
- [SDL_SCANCODE_NONUSHASH] = Q_KEY_CODE_NONUSHASH,
-#endif
- [SDL_SCANCODE_SEMICOLON] = Q_KEY_CODE_SEMICOLON,
- [SDL_SCANCODE_APOSTROPHE] = Q_KEY_CODE_APOSTROPHE,
- [SDL_SCANCODE_GRAVE] = Q_KEY_CODE_GRAVE_ACCENT,
- [SDL_SCANCODE_COMMA] = Q_KEY_CODE_COMMA,
- [SDL_SCANCODE_PERIOD] = Q_KEY_CODE_DOT,
- [SDL_SCANCODE_SLASH] = Q_KEY_CODE_SLASH,
- [SDL_SCANCODE_CAPSLOCK] = Q_KEY_CODE_CAPS_LOCK,
-
- [SDL_SCANCODE_F1] = Q_KEY_CODE_F1,
- [SDL_SCANCODE_F2] = Q_KEY_CODE_F2,
- [SDL_SCANCODE_F3] = Q_KEY_CODE_F3,
- [SDL_SCANCODE_F4] = Q_KEY_CODE_F4,
- [SDL_SCANCODE_F5] = Q_KEY_CODE_F5,
- [SDL_SCANCODE_F6] = Q_KEY_CODE_F6,
- [SDL_SCANCODE_F7] = Q_KEY_CODE_F7,
- [SDL_SCANCODE_F8] = Q_KEY_CODE_F8,
- [SDL_SCANCODE_F9] = Q_KEY_CODE_F9,
- [SDL_SCANCODE_F10] = Q_KEY_CODE_F10,
- [SDL_SCANCODE_F11] = Q_KEY_CODE_F11,
- [SDL_SCANCODE_F12] = Q_KEY_CODE_F12,
-
- [SDL_SCANCODE_PRINTSCREEN] = Q_KEY_CODE_PRINT,
- [SDL_SCANCODE_SCROLLLOCK] = Q_KEY_CODE_SCROLL_LOCK,
- [SDL_SCANCODE_PAUSE] = Q_KEY_CODE_PAUSE,
- [SDL_SCANCODE_INSERT] = Q_KEY_CODE_INSERT,
- [SDL_SCANCODE_HOME] = Q_KEY_CODE_HOME,
- [SDL_SCANCODE_PAGEUP] = Q_KEY_CODE_PGUP,
- [SDL_SCANCODE_DELETE] = Q_KEY_CODE_DELETE,
- [SDL_SCANCODE_END] = Q_KEY_CODE_END,
- [SDL_SCANCODE_PAGEDOWN] = Q_KEY_CODE_PGDN,
- [SDL_SCANCODE_RIGHT] = Q_KEY_CODE_RIGHT,
- [SDL_SCANCODE_LEFT] = Q_KEY_CODE_LEFT,
- [SDL_SCANCODE_DOWN] = Q_KEY_CODE_DOWN,
- [SDL_SCANCODE_UP] = Q_KEY_CODE_UP,
- [SDL_SCANCODE_NUMLOCKCLEAR] = Q_KEY_CODE_NUM_LOCK,
-
- [SDL_SCANCODE_KP_DIVIDE] = Q_KEY_CODE_KP_DIVIDE,
- [SDL_SCANCODE_KP_MULTIPLY] = Q_KEY_CODE_KP_MULTIPLY,
- [SDL_SCANCODE_KP_MINUS] = Q_KEY_CODE_KP_SUBTRACT,
- [SDL_SCANCODE_KP_PLUS] = Q_KEY_CODE_KP_ADD,
- [SDL_SCANCODE_KP_ENTER] = Q_KEY_CODE_KP_ENTER,
- [SDL_SCANCODE_KP_1] = Q_KEY_CODE_KP_1,
- [SDL_SCANCODE_KP_2] = Q_KEY_CODE_KP_2,
- [SDL_SCANCODE_KP_3] = Q_KEY_CODE_KP_3,
- [SDL_SCANCODE_KP_4] = Q_KEY_CODE_KP_4,
- [SDL_SCANCODE_KP_5] = Q_KEY_CODE_KP_5,
- [SDL_SCANCODE_KP_6] = Q_KEY_CODE_KP_6,
- [SDL_SCANCODE_KP_7] = Q_KEY_CODE_KP_7,
- [SDL_SCANCODE_KP_8] = Q_KEY_CODE_KP_8,
- [SDL_SCANCODE_KP_9] = Q_KEY_CODE_KP_9,
- [SDL_SCANCODE_KP_0] = Q_KEY_CODE_KP_0,
- [SDL_SCANCODE_KP_PERIOD] = Q_KEY_CODE_KP_DECIMAL,
-
- [SDL_SCANCODE_NONUSBACKSLASH] = Q_KEY_CODE_LESS,
- [SDL_SCANCODE_APPLICATION] = Q_KEY_CODE_MENU,
-#if 0
- [SDL_SCANCODE_POWER] = Q_KEY_CODE_POWER,
- [SDL_SCANCODE_KP_EQUALS] = Q_KEY_CODE_KP_EQUALS,
-
- [SDL_SCANCODE_F13] = Q_KEY_CODE_F13,
- [SDL_SCANCODE_F14] = Q_KEY_CODE_F14,
- [SDL_SCANCODE_F15] = Q_KEY_CODE_F15,
- [SDL_SCANCODE_F16] = Q_KEY_CODE_F16,
- [SDL_SCANCODE_F17] = Q_KEY_CODE_F17,
- [SDL_SCANCODE_F18] = Q_KEY_CODE_F18,
- [SDL_SCANCODE_F19] = Q_KEY_CODE_F19,
- [SDL_SCANCODE_F20] = Q_KEY_CODE_F20,
- [SDL_SCANCODE_F21] = Q_KEY_CODE_F21,
- [SDL_SCANCODE_F22] = Q_KEY_CODE_F22,
- [SDL_SCANCODE_F23] = Q_KEY_CODE_F23,
- [SDL_SCANCODE_F24] = Q_KEY_CODE_F24,
-
- [SDL_SCANCODE_EXECUTE] = Q_KEY_CODE_EXECUTE,
-#endif
- [SDL_SCANCODE_HELP] = Q_KEY_CODE_HELP,
- [SDL_SCANCODE_MENU] = Q_KEY_CODE_MENU,
-#if 0
- [SDL_SCANCODE_SELECT] = Q_KEY_CODE_SELECT,
-#endif
- [SDL_SCANCODE_STOP] = Q_KEY_CODE_STOP,
- [SDL_SCANCODE_AGAIN] = Q_KEY_CODE_AGAIN,
- [SDL_SCANCODE_UNDO] = Q_KEY_CODE_UNDO,
- [SDL_SCANCODE_CUT] = Q_KEY_CODE_CUT,
- [SDL_SCANCODE_COPY] = Q_KEY_CODE_COPY,
- [SDL_SCANCODE_PASTE] = Q_KEY_CODE_PASTE,
- [SDL_SCANCODE_FIND] = Q_KEY_CODE_FIND,
-#if 0
- [SDL_SCANCODE_MUTE] = Q_KEY_CODE_MUTE,
- [SDL_SCANCODE_VOLUMEUP] = Q_KEY_CODE_VOLUMEUP,
- [SDL_SCANCODE_VOLUMEDOWN] = Q_KEY_CODE_VOLUMEDOWN,
-
- [SDL_SCANCODE_KP_COMMA] = Q_KEY_CODE_KP_COMMA,
- [SDL_SCANCODE_KP_EQUALSAS400] = Q_KEY_CODE_KP_EQUALSAS400,
-
- [SDL_SCANCODE_INTERNATIONAL1] = Q_KEY_CODE_INTERNATIONAL1,
- [SDL_SCANCODE_INTERNATIONAL2] = Q_KEY_CODE_INTERNATIONAL2,
- [SDL_SCANCODE_INTERNATIONAL3] = Q_KEY_CODE_INTERNATIONAL3,
- [SDL_SCANCODE_INTERNATIONAL4] = Q_KEY_CODE_INTERNATIONAL4,
- [SDL_SCANCODE_INTERNATIONAL5] = Q_KEY_CODE_INTERNATIONAL5,
- [SDL_SCANCODE_INTERNATIONAL6] = Q_KEY_CODE_INTERNATIONAL6,
- [SDL_SCANCODE_INTERNATIONAL7] = Q_KEY_CODE_INTERNATIONAL7,
- [SDL_SCANCODE_INTERNATIONAL8] = Q_KEY_CODE_INTERNATIONAL8,
- [SDL_SCANCODE_INTERNATIONAL9] = Q_KEY_CODE_INTERNATIONAL9,
- [SDL_SCANCODE_LANG1] = Q_KEY_CODE_LANG1,
- [SDL_SCANCODE_LANG2] = Q_KEY_CODE_LANG2,
- [SDL_SCANCODE_LANG3] = Q_KEY_CODE_LANG3,
- [SDL_SCANCODE_LANG4] = Q_KEY_CODE_LANG4,
- [SDL_SCANCODE_LANG5] = Q_KEY_CODE_LANG5,
- [SDL_SCANCODE_LANG6] = Q_KEY_CODE_LANG6,
- [SDL_SCANCODE_LANG7] = Q_KEY_CODE_LANG7,
- [SDL_SCANCODE_LANG8] = Q_KEY_CODE_LANG8,
- [SDL_SCANCODE_LANG9] = Q_KEY_CODE_LANG9,
- [SDL_SCANCODE_ALTERASE] = Q_KEY_CODE_ALTERASE,
-#endif
- [SDL_SCANCODE_SYSREQ] = Q_KEY_CODE_SYSRQ,
-#if 0
- [SDL_SCANCODE_CANCEL] = Q_KEY_CODE_CANCEL,
- [SDL_SCANCODE_CLEAR] = Q_KEY_CODE_CLEAR,
- [SDL_SCANCODE_PRIOR] = Q_KEY_CODE_PRIOR,
- [SDL_SCANCODE_RETURN2] = Q_KEY_CODE_RETURN2,
- [SDL_SCANCODE_SEPARATOR] = Q_KEY_CODE_SEPARATOR,
- [SDL_SCANCODE_OUT] = Q_KEY_CODE_OUT,
- [SDL_SCANCODE_OPER] = Q_KEY_CODE_OPER,
- [SDL_SCANCODE_CLEARAGAIN] = Q_KEY_CODE_CLEARAGAIN,
- [SDL_SCANCODE_CRSEL] = Q_KEY_CODE_CRSEL,
- [SDL_SCANCODE_EXSEL] = Q_KEY_CODE_EXSEL,
- [SDL_SCANCODE_KP_00] = Q_KEY_CODE_KP_00,
- [SDL_SCANCODE_KP_000] = Q_KEY_CODE_KP_000,
- [SDL_SCANCODE_THOUSANDSSEPARATOR] = Q_KEY_CODE_THOUSANDSSEPARATOR,
- [SDL_SCANCODE_DECIMALSEPARATOR] = Q_KEY_CODE_DECIMALSEPARATOR,
- [SDL_SCANCODE_CURRENCYUNIT] = Q_KEY_CODE_CURRENCYUNIT,
- [SDL_SCANCODE_CURRENCYSUBUNIT] = Q_KEY_CODE_CURRENCYSUBUNIT,
- [SDL_SCANCODE_KP_LEFTPAREN] = Q_KEY_CODE_KP_LEFTPAREN,
- [SDL_SCANCODE_KP_RIGHTPAREN] = Q_KEY_CODE_KP_RIGHTPAREN,
- [SDL_SCANCODE_KP_LEFTBRACE] = Q_KEY_CODE_KP_LEFTBRACE,
- [SDL_SCANCODE_KP_RIGHTBRACE] = Q_KEY_CODE_KP_RIGHTBRACE,
- [SDL_SCANCODE_KP_TAB] = Q_KEY_CODE_KP_TAB,
- [SDL_SCANCODE_KP_BACKSPACE] = Q_KEY_CODE_KP_BACKSPACE,
- [SDL_SCANCODE_KP_A] = Q_KEY_CODE_KP_A,
- [SDL_SCANCODE_KP_B] = Q_KEY_CODE_KP_B,
- [SDL_SCANCODE_KP_C] = Q_KEY_CODE_KP_C,
- [SDL_SCANCODE_KP_D] = Q_KEY_CODE_KP_D,
- [SDL_SCANCODE_KP_E] = Q_KEY_CODE_KP_E,
- [SDL_SCANCODE_KP_F] = Q_KEY_CODE_KP_F,
- [SDL_SCANCODE_KP_XOR] = Q_KEY_CODE_KP_XOR,
- [SDL_SCANCODE_KP_POWER] = Q_KEY_CODE_KP_POWER,
- [SDL_SCANCODE_KP_PERCENT] = Q_KEY_CODE_KP_PERCENT,
- [SDL_SCANCODE_KP_LESS] = Q_KEY_CODE_KP_LESS,
- [SDL_SCANCODE_KP_GREATER] = Q_KEY_CODE_KP_GREATER,
- [SDL_SCANCODE_KP_AMPERSAND] = Q_KEY_CODE_KP_AMPERSAND,
- [SDL_SCANCODE_KP_DBLAMPERSAND] = Q_KEY_CODE_KP_DBLAMPERSAND,
- [SDL_SCANCODE_KP_VERTICALBAR] = Q_KEY_CODE_KP_VERTICALBAR,
- [SDL_SCANCODE_KP_DBLVERTICALBAR] = Q_KEY_CODE_KP_DBLVERTICALBAR,
- [SDL_SCANCODE_KP_COLON] = Q_KEY_CODE_KP_COLON,
- [SDL_SCANCODE_KP_HASH] = Q_KEY_CODE_KP_HASH,
- [SDL_SCANCODE_KP_SPACE] = Q_KEY_CODE_KP_SPACE,
- [SDL_SCANCODE_KP_AT] = Q_KEY_CODE_KP_AT,
- [SDL_SCANCODE_KP_EXCLAM] = Q_KEY_CODE_KP_EXCLAM,
- [SDL_SCANCODE_KP_MEMSTORE] = Q_KEY_CODE_KP_MEMSTORE,
- [SDL_SCANCODE_KP_MEMRECALL] = Q_KEY_CODE_KP_MEMRECALL,
- [SDL_SCANCODE_KP_MEMCLEAR] = Q_KEY_CODE_KP_MEMCLEAR,
- [SDL_SCANCODE_KP_MEMADD] = Q_KEY_CODE_KP_MEMADD,
- [SDL_SCANCODE_KP_MEMSUBTRACT] = Q_KEY_CODE_KP_MEMSUBTRACT,
- [SDL_SCANCODE_KP_MEMMULTIPLY] = Q_KEY_CODE_KP_MEMMULTIPLY,
- [SDL_SCANCODE_KP_MEMDIVIDE] = Q_KEY_CODE_KP_MEMDIVIDE,
- [SDL_SCANCODE_KP_PLUSMINUS] = Q_KEY_CODE_KP_PLUSMINUS,
- [SDL_SCANCODE_KP_CLEAR] = Q_KEY_CODE_KP_CLEAR,
- [SDL_SCANCODE_KP_CLEARENTRY] = Q_KEY_CODE_KP_CLEARENTRY,
- [SDL_SCANCODE_KP_BINARY] = Q_KEY_CODE_KP_BINARY,
- [SDL_SCANCODE_KP_OCTAL] = Q_KEY_CODE_KP_OCTAL,
- [SDL_SCANCODE_KP_DECIMAL] = Q_KEY_CODE_KP_DECIMAL,
- [SDL_SCANCODE_KP_HEXADECIMAL] = Q_KEY_CODE_KP_HEXADECIMAL,
-#endif
- [SDL_SCANCODE_LCTRL] = Q_KEY_CODE_CTRL,
- [SDL_SCANCODE_LSHIFT] = Q_KEY_CODE_SHIFT,
- [SDL_SCANCODE_LALT] = Q_KEY_CODE_ALT,
- [SDL_SCANCODE_LGUI] = Q_KEY_CODE_META_L,
- [SDL_SCANCODE_RCTRL] = Q_KEY_CODE_CTRL_R,
- [SDL_SCANCODE_RSHIFT] = Q_KEY_CODE_SHIFT_R,
- [SDL_SCANCODE_RALT] = Q_KEY_CODE_ALT_R,
- [SDL_SCANCODE_RGUI] = Q_KEY_CODE_META_R,
-#if 0
- [SDL_SCANCODE_MODE] = Q_KEY_CODE_MODE,
- [SDL_SCANCODE_AUDIONEXT] = Q_KEY_CODE_AUDIONEXT,
- [SDL_SCANCODE_AUDIOPREV] = Q_KEY_CODE_AUDIOPREV,
- [SDL_SCANCODE_AUDIOSTOP] = Q_KEY_CODE_AUDIOSTOP,
- [SDL_SCANCODE_AUDIOPLAY] = Q_KEY_CODE_AUDIOPLAY,
- [SDL_SCANCODE_AUDIOMUTE] = Q_KEY_CODE_AUDIOMUTE,
- [SDL_SCANCODE_MEDIASELECT] = Q_KEY_CODE_MEDIASELECT,
- [SDL_SCANCODE_WWW] = Q_KEY_CODE_WWW,
- [SDL_SCANCODE_MAIL] = Q_KEY_CODE_MAIL,
- [SDL_SCANCODE_CALCULATOR] = Q_KEY_CODE_CALCULATOR,
- [SDL_SCANCODE_COMPUTER] = Q_KEY_CODE_COMPUTER,
- [SDL_SCANCODE_AC_SEARCH] = Q_KEY_CODE_AC_SEARCH,
- [SDL_SCANCODE_AC_HOME] = Q_KEY_CODE_AC_HOME,
- [SDL_SCANCODE_AC_BACK] = Q_KEY_CODE_AC_BACK,
- [SDL_SCANCODE_AC_FORWARD] = Q_KEY_CODE_AC_FORWARD,
- [SDL_SCANCODE_AC_STOP] = Q_KEY_CODE_AC_STOP,
- [SDL_SCANCODE_AC_REFRESH] = Q_KEY_CODE_AC_REFRESH,
- [SDL_SCANCODE_AC_BOOKMARKS] = Q_KEY_CODE_AC_BOOKMARKS,
- [SDL_SCANCODE_BRIGHTNESSDOWN] = Q_KEY_CODE_BRIGHTNESSDOWN,
- [SDL_SCANCODE_BRIGHTNESSUP] = Q_KEY_CODE_BRIGHTNESSUP,
- [SDL_SCANCODE_DISPLAYSWITCH] = Q_KEY_CODE_DISPLAYSWITCH,
- [SDL_SCANCODE_KBDILLUMTOGGLE] = Q_KEY_CODE_KBDILLUMTOGGLE,
- [SDL_SCANCODE_KBDILLUMDOWN] = Q_KEY_CODE_KBDILLUMDOWN,
- [SDL_SCANCODE_KBDILLUMUP] = Q_KEY_CODE_KBDILLUMUP,
- [SDL_SCANCODE_EJECT] = Q_KEY_CODE_EJECT,
- [SDL_SCANCODE_SLEEP] = Q_KEY_CODE_SLEEP,
- [SDL_SCANCODE_APP1] = Q_KEY_CODE_APP1,
- [SDL_SCANCODE_APP2] = Q_KEY_CODE_APP2,
-#endif
-};
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 12/15] ui: convert GTK and SDL1 frontends to keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (10 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 11/15] ui: convert the SDL2 " Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 13/15] ui: remove qemu_input_qcode_to_number method Daniel P. Berrange
` (7 subsequent siblings)
19 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
The x_keycode_to_pc_keycode and evdev_keycode_to_pc_keycode
tables are replaced with automatically generated tables.
In addition the X11 heuristics are improved to detect running
on XQuartz and XWin X11 servers, to activate the correct OS-X
and Win32 keycode maps.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
include/ui/input.h | 21 +++++
ui/Makefile.objs | 12 ++-
ui/gtk.c | 205 ++++++++++++++++++++++++++------------------
ui/input-keymap.c | 7 ++
ui/sdl.c | 103 +++++++---------------
ui/trace-events | 9 +-
ui/x_keymap.c | 247 ++++++++++++++++++++---------------------------------
ui/x_keymap.h | 8 +-
8 files changed, 294 insertions(+), 318 deletions(-)
diff --git a/include/ui/input.h b/include/ui/input.h
index 11bf94aacf..7ac1d62747 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -65,6 +65,9 @@ void qemu_input_check_mode_change(void);
void qemu_add_mouse_mode_change_notifier(Notifier *notify);
void qemu_remove_mouse_mode_change_notifier(Notifier *notify);
+extern const guint qemu_input_map_atset12qcode_len;
+extern const guint16 qemu_input_map_atset12qcode[];
+
extern const guint qemu_input_map_linux2qcode_len;
extern const guint16 qemu_input_map_linux2qcode[];
@@ -98,4 +101,22 @@ extern const guint16 qemu_input_map_qnum2qcode[];
extern const guint qemu_input_map_usb2qcode_len;
extern const guint16 qemu_input_map_usb2qcode[];
+extern const guint qemu_input_map_win322qcode_len;
+extern const guint16 qemu_input_map_win322qcode[];
+
+extern const guint qemu_input_map_x112qcode_len;
+extern const guint16 qemu_input_map_x112qcode[];
+
+extern const guint qemu_input_map_xorgevdev2qcode_len;
+extern const guint16 qemu_input_map_xorgevdev2qcode[];
+
+extern const guint qemu_input_map_xorgkbd2qcode_len;
+extern const guint16 qemu_input_map_xorgkbd2qcode[];
+
+extern const guint qemu_input_map_xorgxquartz2qcode_len;
+extern const guint16 qemu_input_map_xorgxquartz2qcode[];
+
+extern const guint qemu_input_map_xorgxwin2qcode_len;
+extern const guint16 qemu_input_map_xorgxwin2qcode[];
+
#endif /* INPUT_H */
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index cd2bf1e790..f240c4aa87 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -11,11 +11,12 @@ common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o
common-obj-y += input.o input-keymap.o input-legacy.o
common-obj-$(CONFIG_LINUX) += input-linux.o
common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o
-common-obj-$(CONFIG_SDL) += sdl.mo x_keymap.o
+common-obj-$(CONFIG_SDL) += sdl.mo
common-obj-$(CONFIG_COCOA) += cocoa.o
common-obj-$(CONFIG_CURSES) += curses.o
common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
-common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o
+common-obj-$(CONFIG_GTK) += gtk.o
+common-obj-$(if $(CONFIG_WIN32),n,$(if $(CONFIG_SDL),y,$(CONFIG_GTK))) += x_keymap.o
ifeq ($(CONFIG_SDLABI),1.2)
sdl.mo-objs := sdl.o sdl_zoom.o
@@ -54,6 +55,7 @@ KEYCODEMAP_GEN = ui/keycodemapdb/tools/keymap-gen
KEYCODEMAP_CSV = ui/keycodemapdb/data/keymaps.csv
KEYCODEMAP_FILES = \
+ ui/input-keymap-atset12qcode.c \
ui/input-keymap-linux2qcode.c \
ui/input-keymap-osx2qcode.c \
ui/input-keymap-qcode2adb.c \
@@ -65,6 +67,12 @@ KEYCODEMAP_FILES = \
ui/input-keymap-qcode2sun.c \
ui/input-keymap-qnum2qcode.c \
ui/input-keymap-usb2qcode.c \
+ ui/input-keymap-win322qcode.c \
+ ui/input-keymap-x112qcode.c \
+ ui/input-keymap-xorgevdev2qcode.c \
+ ui/input-keymap-xorgkbd2qcode.c \
+ ui/input-keymap-xorgxquartz2qcode.c \
+ ui/input-keymap-xorgxwin2qcode.c \
$(NULL)
GENERATED_FILES += $(KEYCODEMAP_FILES)
diff --git a/ui/gtk.c b/ui/gtk.c
index 5bd87c265a..52519e9aeb 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -52,7 +52,6 @@
#include "ui/input.h"
#include "sysemu/sysemu.h"
#include "qmp-commands.h"
-#include "x_keymap.h"
#include "keymaps.h"
#include "chardev/char.h"
#include "qom/object.h"
@@ -65,6 +64,48 @@
#define VC_SCALE_MIN 0.25
#define VC_SCALE_STEP 0.25
+#ifdef GDK_WINDOWING_X11
+#include "ui/x_keymap.h"
+
+/* Gtk2 compat */
+#ifndef GDK_IS_X11_DISPLAY
+#define GDK_IS_X11_DISPLAY(dpy) (dpy != NULL)
+#endif
+#endif
+
+
+#ifdef GDK_WINDOWING_WAYLAND
+/* Gtk2 compat */
+#ifndef GDK_IS_WAYLAND_DISPLAY
+#define GDK_IS_WAYLAND_DISPLAY(dpy) (dpy != NULL)
+#endif
+#endif
+
+
+#ifdef GDK_WINDOWING_WIN32
+/* Gtk2 compat */
+#ifndef GDK_IS_WIN32_DISPLAY
+#define GDK_IS_WIN32_DISPLAY(dpy) (dpy != NULL)
+#endif
+#endif
+
+
+#ifdef GDK_WINDOWING_BROADWAY
+/* Gtk2 compat */
+#ifndef GDK_IS_BROADWAY_DISPLAY
+#define GDK_IS_BROADWAY_DISPLAY(dpy) (dpy != NULL)
+#endif
+#endif
+
+
+#ifdef GDK_WINDOWING_QUARTZ
+/* Gtk2 compat */
+#ifndef GDK_IS_QUARTZ_DISPLAY
+#define GDK_IS_QUARTZ_DISPLAY(dpy) (dpy != NULL)
+#endif
+#endif
+
+
#if !defined(CONFIG_VTE)
# define VTE_CHECK_VERSION(a, b, c) 0
#endif
@@ -123,10 +164,19 @@
#define HOTKEY_MODIFIERS (GDK_CONTROL_MASK | GDK_MOD1_MASK)
static const int modifier_keycode[] = {
- /* shift, control, alt keys, meta keys, both left & right */
- 0x2a, 0x36, 0x1d, 0x9d, 0x38, 0xb8, 0xdb, 0xdd,
+ Q_KEY_CODE_SHIFT,
+ Q_KEY_CODE_SHIFT_R,
+ Q_KEY_CODE_CTRL,
+ Q_KEY_CODE_CTRL_R,
+ Q_KEY_CODE_ALT,
+ Q_KEY_CODE_ALT_R,
+ Q_KEY_CODE_META_L,
+ Q_KEY_CODE_META_R,
};
+static const guint16 *keycode_map;
+static size_t keycode_maplen;
+
struct GtkDisplayState {
GtkWidget *window;
@@ -178,7 +228,6 @@ struct GtkDisplayState {
bool external_pause_update;
bool modifier_pressed[ARRAY_SIZE(modifier_keycode)];
- bool has_evdev;
bool ignore_keys;
};
@@ -412,18 +461,18 @@ static void gd_update_full_redraw(VirtualConsole *vc)
static void gtk_release_modifiers(GtkDisplayState *s)
{
VirtualConsole *vc = gd_vc_find_current(s);
- int i, keycode;
+ int i, qcode;
if (vc->type != GD_VC_GFX ||
!qemu_console_is_graphic(vc->gfx.dcl.con)) {
return;
}
for (i = 0; i < ARRAY_SIZE(modifier_keycode); i++) {
- keycode = modifier_keycode[i];
+ qcode = modifier_keycode[i];
if (!s->modifier_pressed[i]) {
continue;
}
- qemu_input_event_send_key_number(vc->gfx.dcl.con, keycode, false);
+ qemu_input_event_send_key_qcode(vc->gfx.dcl.con, qcode, false);
s->modifier_pressed[i] = false;
}
}
@@ -1057,47 +1106,73 @@ static gboolean gd_scroll_event(GtkWidget *widget, GdkEventScroll *scroll,
return TRUE;
}
-static int gd_map_keycode(GtkDisplayState *s, GdkDisplay *dpy, int gdk_keycode)
+
+static const guint16 *gd_get_keymap(size_t *maplen)
{
- int qemu_keycode;
+ GdkDisplay *dpy = gdk_display_get_default();
+
+#ifdef GDK_WINDOWING_X11
+ if (GDK_IS_X11_DISPLAY(dpy)) {
+ trace_gd_keymap_windowing("x11");
+ return qemu_xkeymap_mapping_table(
+ gdk_x11_display_get_xdisplay(dpy), maplen);
+ }
+#endif
+
+#ifdef GDK_WINDOWING_WAYLAND
+ if (GDK_IS_WAYLAND_DISPLAY(dpy)) {
+ trace_gd_keymap_windowing("wayland");
+ *maplen = qemu_input_map_xorgevdev2qcode_len;
+ return qemu_input_map_xorgevdev2qcode;
+ }
+#endif
#ifdef GDK_WINDOWING_WIN32
if (GDK_IS_WIN32_DISPLAY(dpy)) {
- qemu_keycode = MapVirtualKey(gdk_keycode, MAPVK_VK_TO_VSC);
- switch (qemu_keycode) {
- case 103: /* alt gr */
- qemu_keycode = 56 | SCANCODE_GREY;
- break;
- }
- return qemu_keycode;
+ trace_gd_keymap_windowing("win32");
+ *maplen = qemu_input_map_win322qcode_len;
+ return qemu_input_map_win322qcode;
}
#endif
- if (gdk_keycode < 9) {
- qemu_keycode = 0;
- } else if (gdk_keycode < 97) {
- qemu_keycode = gdk_keycode - 8;
-#ifdef GDK_WINDOWING_X11
- } else if (GDK_IS_X11_DISPLAY(dpy) && gdk_keycode < 158) {
- if (s->has_evdev) {
- qemu_keycode = translate_evdev_keycode(gdk_keycode - 97);
- } else {
- qemu_keycode = translate_xfree86_keycode(gdk_keycode - 97);
- }
-#endif
-#ifdef GDK_WINDOWING_WAYLAND
- } else if (GDK_IS_WAYLAND_DISPLAY(dpy) && gdk_keycode < 158) {
- qemu_keycode = translate_evdev_keycode(gdk_keycode - 97);
+#ifdef GDK_WINDOWING_QUARTZ
+ if (GDK_IS_QUARTZ_DISPLAY(dpy)) {
+ trace_gd_keymap_windowing("quartz");
+ *maplen = qemu_input_map_osx2qcode_len;
+ return qemu_input_map_osx2qcode;
+ }
#endif
- } else if (gdk_keycode == 208) { /* Hiragana_Katakana */
- qemu_keycode = 0x70;
- } else if (gdk_keycode == 211) { /* backslash */
- qemu_keycode = 0x73;
- } else {
- qemu_keycode = 0;
+
+#ifdef GDK_WINDOWING_BROADWAY
+ if (GDK_IS_BROADWAY_DISPLAY(dpy)) {
+ trace_gd_keymap_windowing("broadway");
+ g_warning("experimental: using broadway, x11 virtual keysym \n"
+ "mapping - with very limited support. See also \n"
+ "https://bugzilla.gnome.org/show_bug.cgi?id=700105");
+ *maplen = qemu_input_map_x112qcode_len;
+ return qemu_input_map_x112qcode;
}
+#endif
- return qemu_keycode;
+ g_warning("Unsupported GDK Windowing platform.\n"
+ "Disabling extended keycode tables.\n"
+ "Please report to qemu-devel@nongnu.org\n"
+ "including the following information:\n"
+ "\n"
+ " - Operating system\n"
+ " - GDK Windowing system build\n");
+ return NULL;
+}
+
+
+static int gd_map_keycode(int scancode)
+{
+ if (!keycode_map)
+ return 0;
+ if (scancode > keycode_maplen)
+ return 0;
+
+ return keycode_map[scancode];
}
static gboolean gd_text_key_down(GtkWidget *widget,
@@ -1111,9 +1186,7 @@ static gboolean gd_text_key_down(GtkWidget *widget,
} else if (key->length) {
kbd_put_string_console(con, key->string, key->length);
} else {
- int num = gd_map_keycode(vc->s, gtk_widget_get_display(widget),
- key->hardware_keycode);
- int qcode = qemu_input_key_number_to_qcode(num);
+ int qcode = gd_map_keycode(key->hardware_keycode);
kbd_put_qcode_console(con, qcode);
}
return TRUE;
@@ -1123,8 +1196,7 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque)
{
VirtualConsole *vc = opaque;
GtkDisplayState *s = vc->s;
- int gdk_keycode = key->hardware_keycode;
- int qemu_keycode;
+ int qcode;
int i;
if (s->ignore_keys) {
@@ -1138,20 +1210,19 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque)
return TRUE;
}
- qemu_keycode = gd_map_keycode(s, gtk_widget_get_display(widget),
- gdk_keycode);
+ qcode = gd_map_keycode(key->hardware_keycode);
- trace_gd_key_event(vc->label, gdk_keycode, qemu_keycode,
+ trace_gd_key_event(vc->label, key->hardware_keycode, qcode,
(key->type == GDK_KEY_PRESS) ? "down" : "up");
for (i = 0; i < ARRAY_SIZE(modifier_keycode); i++) {
- if (qemu_keycode == modifier_keycode[i]) {
+ if (qcode == modifier_keycode[i]) {
s->modifier_pressed[i] = (key->type == GDK_KEY_PRESS);
}
}
- qemu_input_event_send_key_number(vc->gfx.dcl.con, qemu_keycode,
- key->type == GDK_KEY_PRESS);
+ qemu_input_event_send_key_qcode(vc->gfx.dcl.con, qcode,
+ key->type == GDK_KEY_PRESS);
return TRUE;
}
@@ -2195,38 +2266,6 @@ static void gd_create_menus(GtkDisplayState *s)
gtk_window_add_accel_group(GTK_WINDOW(s->window), s->accel_group);
}
-static void gd_set_keycode_type(GtkDisplayState *s)
-{
-#ifdef GDK_WINDOWING_X11
- GdkDisplay *display = gtk_widget_get_display(s->window);
- if (GDK_IS_X11_DISPLAY(display)) {
- Display *x11_display = gdk_x11_display_get_xdisplay(display);
- XkbDescPtr desc = XkbGetMap(x11_display, XkbGBN_AllComponentsMask,
- XkbUseCoreKbd);
- char *keycodes = NULL;
-
- if (desc &&
- (XkbGetNames(x11_display, XkbKeycodesNameMask, desc) == Success)) {
- keycodes = XGetAtomName(x11_display, desc->names->keycodes);
- }
- if (keycodes == NULL) {
- fprintf(stderr, "could not lookup keycode name\n");
- } else if (strstart(keycodes, "evdev", NULL)) {
- s->has_evdev = true;
- } else if (!strstart(keycodes, "xfree86", NULL)) {
- fprintf(stderr, "unknown keycodes `%s', please report to "
- "qemu-devel@nongnu.org\n", keycodes);
- }
-
- if (desc) {
- XkbFreeKeyboard(desc, XkbGBN_AllComponentsMask, True);
- }
- if (keycodes) {
- XFree(keycodes);
- }
- }
-#endif
-}
static gboolean gtkinit;
@@ -2329,8 +2368,6 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
if (grab_on_hover) {
gtk_menu_item_activate(GTK_MENU_ITEM(s->grab_on_hover_item));
}
-
- gd_set_keycode_type(s);
}
void early_gtk_display_init(int opengl)
@@ -2377,6 +2414,8 @@ void early_gtk_display_init(int opengl)
break;
}
+ keycode_map = gd_get_keymap(&keycode_maplen);
+
#if defined(CONFIG_VTE)
type_register(&char_gd_vc_type_info);
#endif
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index c7a9c08bdb..566b8f2000 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -5,6 +5,7 @@
#include "standard-headers/linux/input.h"
+#include "ui/input-keymap-atset12qcode.c"
#include "ui/input-keymap-linux2qcode.c"
#include "ui/input-keymap-osx2qcode.c"
#include "ui/input-keymap-qcode2adb.c"
@@ -16,6 +17,12 @@
#include "ui/input-keymap-qcode2sun.c"
#include "ui/input-keymap-qnum2qcode.c"
#include "ui/input-keymap-usb2qcode.c"
+#include "ui/input-keymap-win322qcode.c"
+#include "ui/input-keymap-x112qcode.c"
+#include "ui/input-keymap-xorgevdev2qcode.c"
+#include "ui/input-keymap-xorgkbd2qcode.c"
+#include "ui/input-keymap-xorgxquartz2qcode.c"
+#include "ui/input-keymap-xorgxwin2qcode.c"
int qemu_input_linux_to_qcode(unsigned int lnx)
{
diff --git a/ui/sdl.c b/ui/sdl.c
index 7b71a9ac58..450f499c24 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -34,7 +34,9 @@
#include "ui/console.h"
#include "ui/input.h"
#include "sysemu/sysemu.h"
+#ifndef WIN32
#include "x_keymap.h"
+#endif
#include "sdl_zoom.h"
static DisplayChangeListener *dcl;
@@ -63,6 +65,8 @@ static SDL_PixelFormat host_format;
static int scaling_active = 0;
static Notifier mouse_mode_notifier;
static int idle_counter;
+static const guint16 *keycode_map;
+static size_t keycode_maplen;
#define SDL_REFRESH_INTERVAL_BUSY 10
#define SDL_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \
@@ -208,95 +212,44 @@ static uint8_t sdl_keyevent_to_keycode_generic(const SDL_KeyboardEvent *ev)
return keysym2scancode(kbd_layout, keysym) & SCANCODE_KEYMASK;
}
-/* specific keyboard conversions from scan codes */
-
-#if defined(_WIN32)
-static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev)
+static const guint16 *sdl_get_keymap(size_t *maplen)
{
- return ev->keysym.scancode;
-}
-
+#if defined(WIN32)
+ *maplen = qemu_input_map_atset12qcode_len;
+ return qemu_input_map_atset12qcode;
#else
-
#if defined(SDL_VIDEO_DRIVER_X11)
-#include <X11/XKBlib.h>
-
-static int check_for_evdev(void)
-{
SDL_SysWMinfo info;
- XkbDescPtr desc = NULL;
- int has_evdev = 0;
- char *keycodes = NULL;
SDL_VERSION(&info.version);
- if (!SDL_GetWMInfo(&info)) {
- return 0;
- }
- desc = XkbGetMap(info.info.x11.display,
- XkbGBN_AllComponentsMask,
- XkbUseCoreKbd);
- if (desc &&
- (XkbGetNames(info.info.x11.display,
- XkbKeycodesNameMask, desc) == Success)) {
- keycodes = XGetAtomName(info.info.x11.display, desc->names->keycodes);
- if (keycodes == NULL) {
- fprintf(stderr, "could not lookup keycode name\n");
- } else if (strstart(keycodes, "evdev", NULL)) {
- has_evdev = 1;
- } else if (!strstart(keycodes, "xfree86", NULL)) {
- fprintf(stderr, "unknown keycodes `%s', please report to "
- "qemu-devel@nongnu.org\n", keycodes);
- }
- }
-
- if (desc) {
- XkbFreeKeyboard(desc, XkbGBN_AllComponentsMask, True);
- }
- if (keycodes) {
- XFree(keycodes);
+ if (SDL_GetWMInfo(&info) > 0) {
+ return qemu_xkeymap_mapping_table(
+ info.info.x11.display, maplen);
}
- return has_evdev;
-}
-#else
-static int check_for_evdev(void)
-{
- return 0;
-}
#endif
+ g_warning("Unsupported SDL video driver / platform.\n"
+ "Assuming Linux KBD scancodes, but probably wrong.\n"
+ "Please report to qemu-devel@nongnu.org\n"
+ "including the following information:\n"
+ "\n"
+ " - Operating system\n"
+ " - SDL video driver\n");
+ *maplen = qemu_input_map_xorgkbd2qcode_len;
+ return qemu_input_map_xorgkbd2qcode;
+#endif
+}
static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev)
{
- int keycode;
- static int has_evdev = -1;
-
- if (has_evdev == -1)
- has_evdev = check_for_evdev();
-
- keycode = ev->keysym.scancode;
+ if (!keycode_map)
+ return 0;
+ if (ev->keysym.scancode > keycode_maplen)
+ return 0;
- if (keycode < 9) {
- keycode = 0;
- } else if (keycode < 97) {
- keycode -= 8; /* just an offset */
- } else if (keycode < 158) {
- /* use conversion table */
- if (has_evdev)
- keycode = translate_evdev_keycode(keycode - 97);
- else
- keycode = translate_xfree86_keycode(keycode - 97);
- } else if (keycode == 208) { /* Hiragana_Katakana */
- keycode = 0x70;
- } else if (keycode == 211) { /* backslash */
- keycode = 0x73;
- } else {
- keycode = 0;
- }
- return keycode;
+ return keycode_map[ev->keysym.scancode];
}
-#endif
-
static void reset_keys(void)
{
int i;
@@ -995,6 +948,8 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
vi = SDL_GetVideoInfo();
host_format = *(vi->vfmt);
+ keycode_map = sdl_get_keymap(&keycode_maplen);
+
/* Load a 32x32x4 image. White pixels are transparent. */
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "qemu-icon.bmp");
if (filename) {
diff --git a/ui/trace-events b/ui/trace-events
index 2a69660e5a..426d234f8f 100644
--- a/ui/trace-events
+++ b/ui/trace-events
@@ -18,9 +18,10 @@ ppm_save(const char *filename, void *display_surface) "%s surface=%p"
# ui/gtk.c
gd_switch(const char *tab, int width, int height) "tab=%s, width=%d, height=%d"
gd_update(const char *tab, int x, int y, int w, int h) "tab=%s, x=%d, y=%d, w=%d, h=%d"
-gd_key_event(const char *tab, int gdk_keycode, int qemu_keycode, const char *action) "tab=%s, translated GDK keycode %d to QEMU keycode %d (%s)"
+gd_key_event(const char *tab, int gdk_keycode, int qkeycode, const char *action) "tab=%s, translated GDK keycode %d to QKeyCode %d (%s)"
gd_grab(const char *tab, const char *device, const char *reason) "tab=%s, dev=%s, reason=%s"
gd_ungrab(const char *tab, const char *device) "tab=%s, dev=%s"
+gd_keymap_windowing(const char *name) "backend=%s"
# ui/vnc.c
vnc_key_guest_leds(bool caps, bool num, bool scroll) "caps %d, num %d, scroll %d"
@@ -50,3 +51,9 @@ qemu_spice_create_update(uint32_t left, uint32_t right, uint32_t top, uint32_t b
keymap_parse(const char *file) "file %s"
keymap_add(const char *type, int sym, int code, const char *line) "%-6s sym=0x%04x code=0x%04x (line: %s)"
keymap_unmapped(int sym) "sym=0x%04x"
+
+# ui/x_keymap.c
+xkeymap_extension(const char *name) "extension '%s'"
+xkeymap_vendor(const char *name) "vendor '%s'"
+xkeymap_keycodes(const char *name) "keycodes '%s'"
+xkeymap_keymap(const char *name) "keymap '%s'"
diff --git a/ui/x_keymap.c b/ui/x_keymap.c
index 27884851de..3e2a9c6b4f 100644
--- a/ui/x_keymap.c
+++ b/ui/x_keymap.c
@@ -1,169 +1,108 @@
/*
- * QEMU SDL display driver
+ * QEMU X11 keymaps
*
- * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (C) 2009-2010 Daniel P. Berrange <dan@berrange.com>
+ * Copyright (C) 2017 Red Hat, Inc
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2 as
+ * published by the Free Software Foundation.
*/
+
#include "qemu/osdep.h"
-#include "qemu-common.h"
+
#include "x_keymap.h"
+#include "trace.h"
+#include "qemu/notify.h"
+#include "ui/input.h"
-static const uint8_t x_keycode_to_pc_keycode[115] = {
- 0xc7, /* 97 Home */
- 0xc8, /* 98 Up */
- 0xc9, /* 99 PgUp */
- 0xcb, /* 100 Left */
- 0x4c, /* 101 KP-5 */
- 0xcd, /* 102 Right */
- 0xcf, /* 103 End */
- 0xd0, /* 104 Down */
- 0xd1, /* 105 PgDn */
- 0xd2, /* 106 Ins */
- 0xd3, /* 107 Del */
- 0x9c, /* 108 Enter */
- 0x9d, /* 109 Ctrl-R */
- 0x0, /* 110 Pause */
- 0xb7, /* 111 Print */
- 0xb5, /* 112 Divide */
- 0xb8, /* 113 Alt-R */
- 0xc6, /* 114 Break */
- 0x0, /* 115 */
- 0x0, /* 116 */
- 0x0, /* 117 */
- 0x0, /* 118 */
- 0x0, /* 119 */
- 0x0, /* 120 */
- 0x0, /* 121 */
- 0x0, /* 122 */
- 0x0, /* 123 */
- 0x0, /* 124 */
- 0x0, /* 125 */
- 0x0, /* 126 */
- 0x0, /* 127 */
- 0x0, /* 128 */
- 0x79, /* 129 Henkan */
- 0x0, /* 130 */
- 0x7b, /* 131 Muhenkan */
- 0x0, /* 132 */
- 0x7d, /* 133 Yen */
- 0x0, /* 134 */
- 0x0, /* 135 */
- 0x47, /* 136 KP_7 */
- 0x48, /* 137 KP_8 */
- 0x49, /* 138 KP_9 */
- 0x4b, /* 139 KP_4 */
- 0x4c, /* 140 KP_5 */
- 0x4d, /* 141 KP_6 */
- 0x4f, /* 142 KP_1 */
- 0x50, /* 143 KP_2 */
- 0x51, /* 144 KP_3 */
- 0x52, /* 145 KP_0 */
- 0x53, /* 146 KP_. */
- 0x47, /* 147 KP_HOME */
- 0x48, /* 148 KP_UP */
- 0x49, /* 149 KP_PgUp */
- 0x4b, /* 150 KP_Left */
- 0x4c, /* 151 KP_ */
- 0x4d, /* 152 KP_Right */
- 0x4f, /* 153 KP_End */
- 0x50, /* 154 KP_Down */
- 0x51, /* 155 KP_PgDn */
- 0x52, /* 156 KP_Ins */
- 0x53, /* 157 KP_Del */
-};
+#include <X11/XKBlib.h>
-/* This table is generated based off the xfree86 -> scancode mapping above
- * and the keycode mappings in /usr/share/X11/xkb/keycodes/evdev
- * and /usr/share/X11/xkb/keycodes/xfree86
- */
+static gboolean check_for_xwin(Display *dpy)
+{
+ const char *vendor = ServerVendor(dpy);
+
+ trace_xkeymap_vendor(vendor);
-static const uint8_t evdev_keycode_to_pc_keycode[61] = {
- 0x73, /* 97 EVDEV - RO ("Internet" Keyboards) */
- 0, /* 98 EVDEV - KATA (Katakana) */
- 0, /* 99 EVDEV - HIRA (Hiragana) */
- 0x79, /* 100 EVDEV - HENK (Henkan) */
- 0x70, /* 101 EVDEV - HKTG (Hiragana/Katakana toggle) */
- 0x7b, /* 102 EVDEV - MUHE (Muhenkan) */
- 0, /* 103 EVDEV - JPCM (KPJPComma) */
- 0x9c, /* 104 KPEN */
- 0x9d, /* 105 RCTL */
- 0xb5, /* 106 KPDV */
- 0xb7, /* 107 PRSC */
- 0xb8, /* 108 RALT */
- 0, /* 109 EVDEV - LNFD ("Internet" Keyboards) */
- 0xc7, /* 110 HOME */
- 0xc8, /* 111 UP */
- 0xc9, /* 112 PGUP */
- 0xcb, /* 113 LEFT */
- 0xcd, /* 114 RGHT */
- 0xcf, /* 115 END */
- 0xd0, /* 116 DOWN */
- 0xd1, /* 117 PGDN */
- 0xd2, /* 118 INS */
- 0xd3, /* 119 DELE */
- 0, /* 120 EVDEV - I120 ("Internet" Keyboards) */
- 0, /* 121 EVDEV - MUTE */
- 0, /* 122 EVDEV - VOL- */
- 0, /* 123 EVDEV - VOL+ */
- 0, /* 124 EVDEV - POWR */
- 0, /* 125 EVDEV - KPEQ */
- 0, /* 126 EVDEV - I126 ("Internet" Keyboards) */
- 0, /* 127 EVDEV - PAUS */
- 0, /* 128 EVDEV - ???? */
- 0x7e, /* 129 EVDEV - KP_COMMA (brazilian) */
- 0xf1, /* 130 EVDEV - HNGL (Korean Hangul Latin toggle) */
- 0xf2, /* 131 EVDEV - HJCV (Korean Hangul Hanja toggle) */
- 0x7d, /* 132 AE13 (Yen)*/
- 0xdb, /* 133 EVDEV - LWIN */
- 0xdc, /* 134 EVDEV - RWIN */
- 0xdd, /* 135 EVDEV - MENU */
- 0, /* 136 EVDEV - STOP */
- 0, /* 137 EVDEV - AGAI */
- 0, /* 138 EVDEV - PROP */
- 0, /* 139 EVDEV - UNDO */
- 0, /* 140 EVDEV - FRNT */
- 0, /* 141 EVDEV - COPY */
- 0, /* 142 EVDEV - OPEN */
- 0, /* 143 EVDEV - PAST */
- 0, /* 144 EVDEV - FIND */
- 0, /* 145 EVDEV - CUT */
- 0, /* 146 EVDEV - HELP */
- 0, /* 147 EVDEV - I147 */
- 0, /* 148 EVDEV - I148 */
- 0, /* 149 EVDEV - I149 */
- 0, /* 150 EVDEV - I150 */
- 0, /* 151 EVDEV - I151 */
- 0, /* 152 EVDEV - I152 */
- 0, /* 153 EVDEV - I153 */
- 0, /* 154 EVDEV - I154 */
- 0, /* 155 EVDEV - I156 */
- 0, /* 156 EVDEV - I157 */
- 0, /* 157 EVDEV - I158 */
-};
+ if (strstr(vendor, "Cygwin/X"))
+ return TRUE;
-uint8_t translate_xfree86_keycode(const int key)
+ return FALSE;
+}
+
+static gboolean check_for_xquartz(Display *dpy)
{
- return x_keycode_to_pc_keycode[key];
+ int nextensions;
+ int i;
+ gboolean match = FALSE;
+ char **extensions = XListExtensions(dpy, &nextensions);
+ for (i = 0 ; extensions != NULL && i < nextensions ; i++) {
+ trace_xkeymap_extension(extensions[i]);
+ if (strcmp(extensions[i], "Apple-WM") == 0 ||
+ strcmp(extensions[i], "Apple-DRI") == 0)
+ match = TRUE;
+ }
+ if (extensions)
+ XFreeExtensionList(extensions);
+
+ return match;
}
-uint8_t translate_evdev_keycode(const int key)
+const guint16 *qemu_xkeymap_mapping_table(Display *dpy, size_t *maplen)
{
- return evdev_keycode_to_pc_keycode[key];
+ XkbDescPtr desc;
+ const gchar *keycodes = NULL;
+
+ /* There is no easy way to determine what X11 server
+ * and platform & keyboard driver is in use. Thus we
+ * do best guess heuristics.
+ *
+ * This will need more work for people with other
+ * X servers..... patches welcomed.
+ */
+
+ desc = XkbGetMap(dpy,
+ XkbGBN_AllComponentsMask,
+ XkbUseCoreKbd);
+ if (desc) {
+ if (XkbGetNames(dpy, XkbKeycodesNameMask, desc) == Success) {
+ keycodes = XGetAtomName (dpy, desc->names->keycodes);
+ if (!keycodes) {
+ g_warning("could not lookup keycode name");
+ } else {
+ trace_xkeymap_keycodes(keycodes);
+ }
+ }
+ XkbFreeKeyboard(desc, XkbGBN_AllComponentsMask, True);
+ }
+
+ if (check_for_xwin(dpy)) {
+ trace_xkeymap_keymap("xwin");
+ *maplen = qemu_input_map_xorgxwin2qcode_len;
+ return qemu_input_map_xorgxwin2qcode;
+ } else if (check_for_xquartz(dpy)) {
+ trace_xkeymap_keymap("xquartz");
+ *maplen = qemu_input_map_xorgxquartz2qcode_len;
+ return qemu_input_map_xorgxquartz2qcode;
+ } else if (keycodes && g_str_has_prefix(keycodes, "evdev")) {
+ trace_xkeymap_keymap("evdev");
+ *maplen = qemu_input_map_xorgevdev2qcode_len;
+ return qemu_input_map_xorgevdev2qcode;
+ } else if (keycodes && g_str_has_prefix(keycodes, "xfree86")) {
+ trace_xkeymap_keymap("kbd");
+ *maplen = qemu_input_map_xorgkbd2qcode_len;
+ return qemu_input_map_xorgkbd2qcode;
+ } else {
+ trace_xkeymap_keymap("NULL");
+ g_warning("Unknown X11 keycode mapping '%s'.\n"
+ "Please report to qemu-devel@nongnu.org\n"
+ "including the following information:\n"
+ "\n"
+ " - Operating system\n"
+ " - X11 Server\n"
+ " - xprop -root\n"
+ " - xdpyinfo\n",
+ keycodes ? keycodes : "<null>");
+ return NULL;
+ }
}
diff --git a/ui/x_keymap.h b/ui/x_keymap.h
index afde2e94bf..0395e335ff 100644
--- a/ui/x_keymap.h
+++ b/ui/x_keymap.h
@@ -1,7 +1,7 @@
/*
- * QEMU SDL display driver
+ * QEMU X11 keymaps
*
- * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2017 Red Hat, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +25,8 @@
#ifndef QEMU_X_KEYMAP_H
#define QEMU_X_KEYMAP_H
-uint8_t translate_xfree86_keycode(const int key);
+#include <X11/Xlib.h>
-uint8_t translate_evdev_keycode(const int key);
+const guint16 *qemu_xkeymap_mapping_table(Display *dpy, size_t *maplen);
#endif
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 13/15] ui: remove qemu_input_qcode_to_number method
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (11 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 12/15] ui: convert GTK and SDL1 frontends " Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 14/15] ui: remove qemu_input_linux_to_qcode method Daniel P. Berrange
` (6 subsequent siblings)
19 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
The qemu_input_qcode_to_number method is only used in one place and
no new code should require it, so inline it at the only caller.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
include/ui/input.h | 1 -
ui/input-keymap.c | 16 +++++++---------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/include/ui/input.h b/include/ui/input.h
index 7ac1d62747..b3827b6082 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -42,7 +42,6 @@ void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down);
void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down);
void qemu_input_event_send_key_delay(uint32_t delay_ms);
int qemu_input_key_number_to_qcode(unsigned int nr);
-int qemu_input_qcode_to_number(QKeyCode qcode);
int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down, int *codes);
int qemu_input_linux_to_qcode(unsigned int lnx);
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 566b8f2000..71c6a79e66 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -32,14 +32,6 @@ int qemu_input_linux_to_qcode(unsigned int lnx)
return qemu_input_map_linux2qcode[lnx];
}
-int qemu_input_qcode_to_number(QKeyCode qcode)
-{
- if (qcode >= qemu_input_map_qcode2qnum_len) {
- return 0;
- }
- return qemu_input_map_qcode2qnum[qcode];
-}
-
int qemu_input_key_number_to_qcode(unsigned int nr)
{
if (nr >= qemu_input_map_qnum2qcode_len) {
@@ -51,9 +43,15 @@ int qemu_input_key_number_to_qcode(unsigned int nr)
int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down,
int *codes)
{
- int keycode = qemu_input_qcode_to_number(qcode);
+ int keycode;
int count = 0;
+ if (qcode >= qemu_input_map_qcode2qnum_len) {
+ keycode = 0;
+ } else {
+ keycode = qemu_input_map_qcode2qnum[qcode];
+ }
+
if (qcode == Q_KEY_CODE_PAUSE) {
/* specific case */
int v = down ? 0 : 0x80;
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 14/15] ui: remove qemu_input_linux_to_qcode method
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (12 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 13/15] ui: remove qemu_input_qcode_to_number method Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 15/15] display: convert XenInput keyboard to keycodemapdb Daniel P. Berrange
` (5 subsequent siblings)
19 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
The qemu_input_linux_to_qcode method is only used in one place and
no new code should require it, so inline it at the only caller.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
include/ui/input.h | 1 -
ui/input-keymap.c | 8 --------
ui/input-linux.c | 4 ++--
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/include/ui/input.h b/include/ui/input.h
index b3827b6082..92e54c25e2 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -43,7 +43,6 @@ void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down);
void qemu_input_event_send_key_delay(uint32_t delay_ms);
int qemu_input_key_number_to_qcode(unsigned int nr);
int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down, int *codes);
-int qemu_input_linux_to_qcode(unsigned int lnx);
InputEvent *qemu_input_event_new_btn(InputButton btn, bool down);
void qemu_input_queue_btn(QemuConsole *src, InputButton btn, bool down);
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 71c6a79e66..bbd818ef97 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -24,14 +24,6 @@
#include "ui/input-keymap-xorgxquartz2qcode.c"
#include "ui/input-keymap-xorgxwin2qcode.c"
-int qemu_input_linux_to_qcode(unsigned int lnx)
-{
- if (lnx >= qemu_input_map_linux2qcode_len) {
- return 0;
- }
- return qemu_input_map_linux2qcode[lnx];
-}
-
int qemu_input_key_number_to_qcode(unsigned int nr)
{
if (nr >= qemu_input_map_qnum2qcode_len) {
diff --git a/ui/input-linux.c b/ui/input-linux.c
index 9720333b2c..f5eb589b1d 100644
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -128,8 +128,8 @@ static void input_linux_handle_keyboard(InputLinux *il,
}
/* send event to guest when grab is active */
- if (il->grab_active) {
- int qcode = qemu_input_linux_to_qcode(event->code);
+ if (il->grab_active && event->code < qemu_input_map_linux2qcode_len) {
+ int qcode = qemu_input_map_linux2qcode[event->code];
qemu_input_event_send_key_qcode(NULL, qcode, event->value);
}
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [Qemu-devel] [PATCH 15/15] display: convert XenInput keyboard to keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (13 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 14/15] ui: remove qemu_input_linux_to_qcode method Daniel P. Berrange
@ 2017-08-10 15:55 ` Daniel P. Berrange
2017-08-10 16:10 ` [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb no-reply
` (4 subsequent siblings)
19 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Daniel P. Berrange
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 <berrange@redhat.com>
---
hw/display/xenfb.c | 131 ++++++++++++-----------------------------------------
1 file changed, 28 insertions(+), 103 deletions(-)
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index df8b78f6f4..fc3f1198e0 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -28,6 +28,7 @@
#include "hw/hw.h"
#include "ui/console.h"
+#include "ui/input.h"
#include "hw/xen/xen_backend.h"
#include <xen/event_channel.h>
@@ -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;
};
@@ -120,78 +121,6 @@ static void common_unbind(struct common *c)
/* -------------------------------------------------------------------- */
-#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] = {
-
- 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] = {
-
- 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 = 0; i < 128; i++) {
- * scancode2linux[i] = atkbd_set2_keycode[atkbd_unxlate_table[i]];
- * scancode2linux[i | 0x80] = atkbd_set2_keycode[atkbd_unxlate_table[i] | 0x80];
- * }
- */
-static const unsigned char scancode2linux[512] = {
- 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,37 +189,19 @@ static int xenfb_send_position(struct XenInput *xenfb,
return xenfb_kbd_event(xenfb, &event);
}
-/*
- * 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 = opaque;
- int down = 1;
+ struct XenInput *xenfb = container_of(dev, struct XenInput,
+ c.xendev.qdev);
+ InputKeyEvent *key = evt->u.key.data;
- if (scancode == 0xe0) {
- xenfb->extended = 1;
- return;
- } else if (scancode & 0x80) {
- scancode &= 0x7f;
- down = 0;
- }
- if (xenfb->extended) {
- scancode |= 0x80;
- xenfb->extended = 0;
+ assert(evt->type == INPUT_EVENT_KIND_KEY);
+
+ if (key->key < qemu_input_map_qcode2linux_len) {
+ xenfb_send_key(xenfb, key->down,
+ qemu_input_map_qcode2linux[key->key]);
}
- xenfb_send_key(xenfb, down, scancode2linux[scancode]);
}
/*
@@ -347,6 +258,12 @@ static int input_init(struct XenDevice *xendev)
return 0;
}
+static QemuInputHandler xenfb_keyboard_handler = {
+ .name = "Xen FB Keyboard",
+ .mask = INPUT_EVENT_MASK_KEY,
+ .event = xenfb_key_event,
+};
+
static int input_initialise(struct XenDevice *xendev)
{
struct XenInput *in = container_of(xendev, struct XenInput, c.xendev);
@@ -356,7 +273,6 @@ static int input_initialise(struct XenDevice *xendev)
if (rc != 0)
return rc;
- qemu_add_kbd_event_handler(xenfb_key_event, in);
return 0;
}
@@ -376,6 +292,12 @@ static void input_connected(struct XenDevice *xendev)
in->qmouse = 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 = qemu_input_handler_register((DeviceState *)in,
+ &xenfb_keyboard_handler);
}
static void input_disconnect(struct XenDevice *xendev)
@@ -386,7 +308,10 @@ static void input_disconnect(struct XenDevice *xendev)
qemu_remove_mouse_event_handler(in->qmouse);
in->qmouse = NULL;
}
- qemu_add_kbd_event_handler(NULL, NULL);
+ if (in->qkbd) {
+ qemu_input_handler_unregister(in->qkbd);
+ in->qkbd = NULL;
+ }
common_unbind(&in->c);
}
--
2.13.3
^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (14 preceding siblings ...)
2017-08-10 15:55 ` [Qemu-devel] [PATCH 15/15] display: convert XenInput keyboard to keycodemapdb Daniel P. Berrange
@ 2017-08-10 16:10 ` no-reply
2017-08-10 16:59 ` Daniel P. Berrange
2017-08-10 16:11 ` no-reply
` (3 subsequent siblings)
19 siblings, 1 reply; 33+ messages in thread
From: no-reply @ 2017-08-10 16:10 UTC (permalink / raw)
To: berrange; +Cc: famz, qemu-devel, kraxel
Hi,
This series failed build test on s390x host. Please find the details below.
Subject: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
Type: series
Message-id: 20170810155522.31099-1-berrange@redhat.com
=== TEST SCRIPT BEGIN ===
#!/bin/bash
# Testing script will be invoked under the git checkout with
# HEAD pointing to a commit that has the patches applied on top of "base"
# branch
set -e
echo "=== ENV ==="
env
echo "=== PACKAGES ==="
rpm -qa
echo "=== TEST BEGIN ==="
CC=$HOME/bin/cc
INSTALL=$PWD/install
BUILD=$PWD/build
echo -n "Using CC: "
realpath $CC
mkdir -p $BUILD $INSTALL
SRC=$PWD
cd $BUILD
$SRC/configure --cc=$CC --prefix=$INSTALL
make -j4
# XXX: we need reliable clean up
# make check -j4 V=1
make install
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/150229685736.21846.2809147507731700887.stgit@bahia.lan -> patchew/150229685736.21846.2809147507731700887.stgit@bahia.lan
- [tag update] patchew/1502359588-29451-1-git-send-email-armbru@redhat.com -> patchew/1502359588-29451-1-git-send-email-armbru@redhat.com
- [tag update] patchew/1502365466-19432-1-git-send-email-thuth@redhat.com -> patchew/1502365466-19432-1-git-send-email-thuth@redhat.com
- [tag update] patchew/1502367921-17730-1-git-send-email-armbru@redhat.com -> patchew/1502367921-17730-1-git-send-email-armbru@redhat.com
- [tag update] patchew/20170808162629.32493-1-quintela@redhat.com -> patchew/20170808162629.32493-1-quintela@redhat.com
- [tag update] patchew/20170809203808.31725-1-eblake@redhat.com -> patchew/20170809203808.31725-1-eblake@redhat.com
- [tag update] patchew/20170810080108.31047-1-famz@redhat.com -> patchew/20170810080108.31047-1-famz@redhat.com
- [tag update] patchew/20170810123741.30449-1-cohuck@redhat.com -> patchew/20170810123741.30449-1-cohuck@redhat.com
* [new tag] patchew/20170810155522.31099-1-berrange@redhat.com -> patchew/20170810155522.31099-1-berrange@redhat.com
Switched to a new branch 'test'
7c26de2 display: convert XenInput keyboard to keycodemapdb
b9d4f63 ui: remove qemu_input_linux_to_qcode method
b82952e ui: remove qemu_input_qcode_to_number method
e61e51c ui: convert GTK and SDL1 frontends to keycodemapdb
8da0073 ui: convert the SDL2 frontend to keycodemapdb
f4347fa ui: convert cocoa frontend to keycodemapdb
0bb5e3c char: convert the escc device to keycodemapdb
1524c65 input: convert the adb device to keycodemapdb
931965d input: convert ps2 device to keycodemapdb
0e01238 input: convert virtio-input-hid device to keycodemapdb
f6ca40d ui: use QKeyCode exclusively in InputKeyEvent
5252b59 ui: don't export qemu_input_event_new_key
047c3a0 ui: convert key events to QKeyCodes immediately
9ee7d58 ui: convert common input code to keycodemapdb
ae5a212 ui: add keycodemapdb repository as a GIT submodule
=== OUTPUT BEGIN ===
=== ENV ===
XDG_SESSION_ID=20695
SHELL=/bin/sh
USER=fam
PATCHEW=/home/fam/patchew/patchew-cli -s http://patchew.org --nodebug
PATH=/usr/bin:/bin
PWD=/var/tmp/patchew-tester-tmp-pe1ekf8x/src
LANG=en_US.UTF-8
HOME=/home/fam
SHLVL=2
LOGNAME=fam
DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1012/bus
XDG_RUNTIME_DIR=/run/user/1012
_=/usr/bin/env
=== PACKAGES ===
gpg-pubkey-873529b8-54e386ff
xz-libs-5.2.2-2.fc24.s390x
libxshmfence-1.2-3.fc24.s390x
giflib-4.1.6-15.fc24.s390x
trousers-lib-0.3.13-6.fc24.s390x
ncurses-base-6.0-6.20160709.fc25.noarch
gmp-6.1.1-1.fc25.s390x
libidn-1.33-1.fc25.s390x
slang-2.3.0-7.fc25.s390x
pkgconfig-0.29.1-1.fc25.s390x
alsa-lib-1.1.1-2.fc25.s390x
yum-metadata-parser-1.1.4-17.fc25.s390x
python3-slip-dbus-0.6.4-4.fc25.noarch
python2-cssselect-0.9.2-1.fc25.noarch
createrepo_c-libs-0.10.0-6.fc25.s390x
initscripts-9.69-1.fc25.s390x
parted-3.2-21.fc25.s390x
flex-2.6.0-3.fc25.s390x
colord-libs-1.3.4-1.fc25.s390x
python-osbs-client-0.33-3.fc25.noarch
perl-Pod-Simple-3.35-1.fc25.noarch
python2-simplejson-3.10.0-1.fc25.s390x
brltty-5.4-2.fc25.s390x
librados2-10.2.4-2.fc25.s390x
tcp_wrappers-7.6-83.fc25.s390x
libcephfs_jni1-10.2.4-2.fc25.s390x
nettle-devel-3.3-1.fc25.s390x
bzip2-devel-1.0.6-21.fc25.s390x
libuuid-2.28.2-2.fc25.s390x
python3-dnf-1.1.10-6.fc25.noarch
texlive-kpathsea-doc-svn41139-33.fc25.1.noarch
openssh-7.4p1-4.fc25.s390x
texlive-kpathsea-bin-svn40473-33.20160520.fc25.1.s390x
texlive-graphics-svn41015-33.fc25.1.noarch
texlive-dvipdfmx-def-svn40328-33.fc25.1.noarch
texlive-mfware-svn40768-33.fc25.1.noarch
texlive-texlive-scripts-svn41433-33.fc25.1.noarch
texlive-euro-svn22191.1.1-33.fc25.1.noarch
texlive-etex-svn37057.0-33.fc25.1.noarch
texlive-iftex-svn29654.0.2-33.fc25.1.noarch
texlive-palatino-svn31835.0-33.fc25.1.noarch
texlive-texlive-docindex-svn41430-33.fc25.1.noarch
texlive-xunicode-svn30466.0.981-33.fc25.1.noarch
texlive-koma-script-svn41508-33.fc25.1.noarch
texlive-pst-grad-svn15878.1.06-33.fc25.1.noarch
texlive-pst-blur-svn15878.2.0-33.fc25.1.noarch
texlive-jknapltx-svn19440.0-33.fc25.1.noarch
texinfo-6.1-4.fc25.s390x
openssl-devel-1.0.2k-1.fc25.s390x
gdk-pixbuf2-2.36.6-1.fc25.s390x
nspr-4.14.0-2.fc25.s390x
nss-softokn-freebl-3.30.2-1.0.fc25.s390x
jansson-2.10-2.fc25.s390x
fedora-repos-25-4.noarch
python3-libs-3.5.3-6.fc25.s390x
perl-Errno-1.25-387.fc25.s390x
acl-2.2.52-13.fc25.s390x
pcre2-utf16-10.23-8.fc25.s390x
pango-1.40.5-1.fc25.s390x
systemd-pam-231-17.fc25.s390x
python2-gluster-3.10.4-1.fc25.s390x
NetworkManager-libnm-1.4.4-5.fc25.s390x
selinux-policy-3.13.1-225.18.fc25.noarch
poppler-0.45.0-5.fc25.s390x
ccache-3.3.4-1.fc25.s390x
valgrind-3.12.0-9.fc25.s390x
perl-open-1.10-387.fc25.noarch
libaio-0.3.110-6.fc24.s390x
libfontenc-1.1.3-3.fc24.s390x
lzo-2.08-8.fc24.s390x
isl-0.14-5.fc24.s390x
libXau-1.0.8-6.fc24.s390x
linux-atm-libs-2.5.1-14.fc24.s390x
libXext-1.3.3-4.fc24.s390x
libXxf86vm-1.1.4-3.fc24.s390x
bison-3.0.4-4.fc24.s390x
perl-srpm-macros-1-20.fc25.noarch
gawk-4.1.3-8.fc25.s390x
libwayland-client-1.12.0-1.fc25.s390x
perl-Exporter-5.72-366.fc25.noarch
perl-version-0.99.17-1.fc25.s390x
fftw-libs-double-3.3.5-3.fc25.s390x
libssh2-1.8.0-1.fc25.s390x
ModemManager-glib-1.6.4-1.fc25.s390x
newt-python3-0.52.19-2.fc25.s390x
python-munch-2.0.4-3.fc25.noarch
python-bugzilla-1.2.2-4.fc25.noarch
libedit-3.1-16.20160618cvs.fc25.s390x
createrepo_c-0.10.0-6.fc25.s390x
device-mapper-multipath-libs-0.4.9-83.fc25.s390x
yum-3.4.3-510.fc25.noarch
dracut-config-rescue-044-78.fc25.s390x
mozjs17-17.0.0-16.fc25.s390x
libselinux-2.5-13.fc25.s390x
libgo-devel-6.3.1-1.fc25.s390x
python2-pyparsing-2.1.10-1.fc25.noarch
cairo-gobject-1.14.8-1.fc25.s390x
ethtool-4.8-1.fc25.s390x
xorg-x11-proto-devel-7.7-20.fc25.noarch
brlapi-0.6.5-2.fc25.s390x
librados-devel-10.2.4-2.fc25.s390x
libXinerama-devel-1.1.3-6.fc24.s390x
lua-posix-33.3.1-3.fc25.s390x
usbredir-devel-0.7.1-2.fc24.s390x
libepoxy-1.4.1-1.fc25.s390x
python3-dnf-plugins-core-0.1.21-5.fc25.noarch
texlive-pdftex-doc-svn41149-33.fc25.1.noarch
openssh-clients-7.4p1-4.fc25.s390x
iptables-1.6.0-3.fc25.s390x
texlive-texlive.infra-svn41280-33.fc25.1.noarch
texlive-graphics-cfg-svn40269-33.fc25.1.noarch
texlive-bibtex-svn40768-33.fc25.1.noarch
texlive-mfware-bin-svn40473-33.20160520.fc25.1.s390x
texlive-texlive-scripts-bin-svn29741.0-33.20160520.fc25.1.noarch
texlive-sauerj-svn15878.0-33.fc25.1.noarch
texlive-enctex-svn34957.0-33.fc25.1.noarch
texlive-ifetex-svn24853.1.2-33.fc25.1.noarch
texlive-ntgclass-svn15878.2.1a-33.fc25.1.noarch
texlive-tex-gyre-math-svn41264-33.fc25.1.noarch
texlive-bera-svn20031.0-33.fc25.1.noarch
texlive-ms-svn29849.0-33.fc25.1.noarch
texlive-pst-fill-svn15878.1.01-33.fc25.1.noarch
texlive-ctable-svn38672-33.fc25.1.noarch
texlive-extsizes-svn17263.1.4a-33.fc25.1.noarch
texlive-collection-latexrecommended-svn35765.0-33.20160520.fc25.1.noarch
perl-Filter-1.57-1.fc25.s390x
krb5-workstation-1.14.4-7.fc25.s390x
python2-rpm-macros-3-12.fc25.noarch
libglvnd-egl-0.2.999-14.20170308git8e6e102.fc25.s390x
libglvnd-opengl-0.2.999-14.20170308git8e6e102.fc25.s390x
gdbm-1.13-1.fc25.s390x
nss-util-3.30.2-1.0.fc25.s390x
libcrypt-nss-2.24-9.fc25.s390x
libtasn1-4.12-1.fc25.s390x
fedora-release-25-2.noarch
gdb-headless-7.12.1-48.fc25.s390x
perl-macros-5.24.2-387.fc25.s390x
sqlite-devel-3.14.2-2.fc25.s390x
pcre-devel-8.41-1.fc25.s390x
libX11-1.6.5-1.fc25.s390x
coreutils-8.25-17.fc25.s390x
python2-openidc-client-0-3.20170523git77cb3ee.fc25.noarch
nss-sysinit-3.30.2-1.1.fc25.s390x
systemtap-client-3.1-5.fc25.s390x
nss-devel-3.30.2-1.1.fc25.s390x
firewalld-0.4.4.5-1.fc25.noarch
rpmlint-1.9-9.fc25.noarch
system-python-3.5.3-6.fc25.s390x
gpg-pubkey-efe550f5-5220ba41
gpg-pubkey-81b46521-55b3ca9a
filesystem-3.2-37.fc24.s390x
libffi-3.1-9.fc24.s390x
keyutils-libs-1.5.9-8.fc24.s390x
libnfnetlink-1.0.1-8.fc24.s390x
libtheora-1.1.1-14.fc24.s390x
xml-common-0.6.3-44.fc24.noarch
autoconf-2.69-22.fc24.noarch
libXt-1.1.5-3.fc24.s390x
kbd-legacy-2.0.3-3.fc24.noarch
ghostscript-fonts-5.50-35.fc24.noarch
libXevie-1.0.3-11.fc24.s390x
libcap-2.25-2.fc25.s390x
mpfr-3.1.5-1.fc25.s390x
perl-Carp-1.40-365.fc25.noarch
libmnl-1.0.4-1.fc25.s390x
perl-Unicode-EastAsianWidth-1.33-8.fc25.noarch
libwayland-cursor-1.12.0-1.fc25.s390x
python-krbV-1.0.90-12.fc25.s390x
python2-urllib3-1.15.1-3.fc25.noarch
fipscheck-1.4.1-11.fc25.s390x
libndp-1.6-1.fc25.s390x
gnupg2-2.1.13-2.fc25.s390x
libXfixes-5.0.3-1.fc25.s390x
adwaita-icon-theme-3.22.0-1.fc25.noarch
dconf-0.26.0-1.fc25.s390x
ncurses-devel-6.0-6.20160709.fc25.s390x
dejagnu-1.6-1.fc25.noarch
libstdc++-devel-6.3.1-1.fc25.s390x
device-mapper-1.02.136-3.fc25.s390x
subversion-1.9.5-1.fc25.s390x
libtool-ltdl-2.4.6-13.fc25.s390x
libevent-2.0.22-1.fc25.s390x
atk-devel-2.22.0-1.fc25.s390x
libev-4.24-1.fc25.s390x
xorg-x11-fonts-Type1-7.5-16.fc24.noarch
brlapi-devel-0.6.5-2.fc25.s390x
pulseaudio-libs-10.0-2.fc25.s390x
glib2-2.50.3-1.fc25.s390x
python2-rpm-4.13.0.1-1.fc25.s390x
dnf-1.1.10-6.fc25.noarch
texlive-metafont-bin-svn40987-33.20160520.fc25.1.s390x
texlive-xkeyval-svn35741.2.7a-33.fc25.1.noarch
texlive-euler-svn17261.2.5-33.fc25.1.noarch
texlive-mptopdf-svn41282-33.fc25.1.noarch
texlive-wasy-svn35831.0-33.fc25.1.noarch
texlive-avantgar-svn31835.0-33.fc25.1.noarch
texlive-eurosym-svn17265.1.4_subrfix-33.fc25.1.noarch
texlive-knuth-lib-svn35820.0-33.fc25.1.noarch
texlive-parallel-svn15878.0-33.fc25.1.noarch
texlive-texlive-msg-translations-svn41431-33.fc25.1.noarch
texlive-latex-svn40218-33.fc25.1.noarch
texlive-lualatex-math-svn40621-33.fc25.1.noarch
texlive-auto-pst-pdf-svn23723.0.6-33.fc25.1.noarch
texlive-powerdot-svn38984-33.fc25.1.noarch
texlive-wasysym-svn15878.2.0-33.fc25.1.noarch
ImageMagick-libs-6.9.3.0-6.fc25.s390x
geoclue2-2.4.5-1.fc25.s390x
perl-IO-Socket-IP-0.39-1.fc25.noarch
python2-pyasn1-0.2.3-1.fc25.noarch
libglvnd-0.2.999-14.20170308git8e6e102.fc25.s390x
libglvnd-gles-0.2.999-14.20170308git8e6e102.fc25.s390x
gdk-pixbuf2-devel-2.36.6-1.fc25.s390x
at-spi2-core-devel-2.22.1-1.fc25.s390x
libacl-2.2.52-13.fc25.s390x
perl-libs-5.24.2-387.fc25.s390x
mesa-libglapi-17.0.5-3.fc25.s390x
kernel-headers-4.11.10-200.fc25.s390x
p11-kit-devel-0.23.2-4.fc25.s390x
python3-rpmconf-1.0.19-1.fc25.noarch
sqlite-3.14.2-2.fc25.s390x
pcre-utf32-8.41-1.fc25.s390x
libX11-common-1.6.5-1.fc25.noarch
coreutils-common-8.25-17.fc25.s390x
mesa-libEGL-17.0.5-3.fc25.s390x
nss-3.30.2-1.1.fc25.s390x
systemtap-runtime-3.1-5.fc25.s390x
NetworkManager-glib-1.4.4-5.fc25.s390x
audit-2.7.7-1.fc25.s390x
perl-Time-HiRes-1.9742-1.fc25.s390x
libsolv-0.6.28-1.fc25.s390x
gpg-pubkey-34ec9cba-54e38751
gpg-pubkey-030d5aed-55b577f0
basesystem-11-2.fc24.noarch
libmpc-1.0.2-5.fc24.s390x
libunistring-0.9.4-3.fc24.s390x
libmodman-2.0.1-12.fc24.s390x
lsscsi-0.28-3.fc24.s390x
kbd-misc-2.0.3-3.fc24.noarch
kmod-23-1.fc25.s390x
newt-0.52.19-2.fc25.s390x
perl-Text-Unidecode-1.27-3.fc25.noarch
plymouth-core-libs-0.9.3-0.6.20160620git0e65b86c.fc25.s390x
which-2.21-1.fc25.s390x
python3-slip-0.6.4-4.fc25.noarch
python3-systemd-232-1.fc25.s390x
python-lockfile-0.11.0-4.fc25.noarch
python2-requests-2.10.0-4.fc25.noarch
libnghttp2-1.13.0-2.fc25.s390x
python-urlgrabber-3.10.1-9.fc25.noarch
iputils-20161105-1.fc25.s390x
rest-0.8.0-1.fc25.s390x
adwaita-cursor-theme-3.22.0-1.fc25.noarch
authconfig-6.2.10-14.fc25.s390x
automake-1.15-7.fc25.noarch
shared-mime-info-1.8-1.fc25.s390x
pigz-2.3.4-1.fc25.s390x
device-mapper-libs-1.02.136-3.fc25.s390x
dnsmasq-2.76-2.fc25.s390x
fedora-packager-0.6.0.1-1.fc25.noarch
gcc-c++-6.3.1-1.fc25.s390x
libwebp-0.5.2-1.fc25.s390x
boost-system-1.60.0-10.fc25.s390x
libasyncns-0.8-10.fc24.s390x
libXau-devel-1.0.8-6.fc24.s390x
libverto-libev-0.2.6-6.fc24.s390x
python3-html5lib-0.999-9.fc25.noarch
ttmkfdir-3.0.9-48.fc24.s390x
pulseaudio-libs-glib2-10.0-2.fc25.s390x
wpa_supplicant-2.6-1.fc25.s390x
texlive-lib-2016-33.20160520.fc25.s390x
libXi-devel-1.7.9-1.fc25.s390x
python3-distro-1.0.3-1.fc25.noarch
rpm-plugin-systemd-inhibit-4.13.0.1-1.fc25.s390x
texlive-texlive-common-doc-svn40682-33.fc25.1.noarch
packagedb-cli-2.14.1-1.fc25.noarch
texlive-metafont-svn40793-33.fc25.1.noarch
texlive-tools-svn40934-33.fc25.1.noarch
texlive-enumitem-svn24146.3.5.2-33.fc25.1.noarch
texlive-mptopdf-bin-svn18674.0-33.20160520.fc25.1.noarch
texlive-underscore-svn18261.0-33.fc25.1.noarch
texlive-anysize-svn15878.0-33.fc25.1.noarch
texlive-euenc-svn19795.0.1h-33.fc25.1.noarch
texlive-kastrup-svn15878.0-33.fc25.1.noarch
texlive-paralist-svn39247-33.fc25.1.noarch
texlive-texlive-en-svn41185-33.fc25.1.noarch
texlive-tipa-svn29349.1.3-33.fc25.1.noarch
texlive-currfile-svn40725-33.fc25.1.noarch
texlive-pst-node-svn40743-33.fc25.1.noarch
texlive-pst-slpe-svn24391.1.31-33.fc25.1.noarch
texlive-typehtml-svn17134.0-33.fc25.1.noarch
SDL2-devel-2.0.5-3.fc25.s390x
libcroco-0.6.11-3.fc25.s390x
bluez-libs-devel-5.44-1.fc25.s390x
kernel-4.10.8-200.fc25.s390x
expat-2.2.1-1.fc25.s390x
system-python-libs-3.5.3-6.fc25.s390x
pcre2-10.23-8.fc25.s390x
firewalld-filesystem-0.4.4.5-1.fc25.noarch
pcre-cpp-8.41-1.fc25.s390x
python3-firewall-0.4.4.5-1.fc25.noarch
freetype-devel-2.6.5-9.fc25.s390x
pcre-utf16-8.41-1.fc25.s390x
linux-firmware-20170605-74.git37857004.fc25.noarch
distribution-gpg-keys-1.12-1.fc25.noarch
kernel-modules-4.11.10-200.fc25.s390x
gnutls-devel-3.5.14-1.fc25.s390x
systemtap-devel-3.1-5.fc25.s390x
java-1.8.0-openjdk-1.8.0.131-1.b12.fc25.s390x
polkit-0.113-8.fc25.s390x
perl-SelfLoader-1.23-387.fc25.noarch
libdb-utils-5.3.28-24.fc25.s390x
fontpackages-filesystem-1.44-17.fc24.noarch
groff-base-1.22.3-8.fc24.s390x
ilmbase-2.2.0-5.fc24.s390x
OpenEXR-libs-2.2.0-5.fc24.s390x
hesiod-3.2.1-6.fc24.s390x
sysfsutils-2.1.0-19.fc24.s390x
ocaml-srpm-macros-2-4.fc24.noarch
mailx-12.5-19.fc24.s390x
ncurses-libs-6.0-6.20160709.fc25.s390x
ipset-libs-6.29-1.fc25.s390x
gmp-devel-6.1.1-1.fc25.s390x
python-pip-8.1.2-2.fc25.noarch
harfbuzz-1.3.2-1.fc25.s390x
python2-iniparse-0.4-20.fc25.noarch
python3-iniparse-0.4-20.fc25.noarch
python3-kickstart-2.32-1.fc25.noarch
perl-Net-SSLeay-1.78-1.fc25.s390x
drpm-0.3.0-3.fc25.s390x
glib-networking-2.50.0-1.fc25.s390x
webkitgtk3-2.4.11-3.fc25.s390x
libXaw-1.0.13-4.fc25.s390x
xorg-x11-font-utils-7.5-32.fc25.s390x
hardlink-1.1-1.fc25.s390x
libcom_err-1.43.3-1.fc25.s390x
python2-dateutil-2.6.0-1.fc25.noarch
libXpm-3.5.12-1.fc25.s390x
python2-smmap-2.0.1-1.fc25.noarch
poppler-data-0.4.7-6.fc25.noarch
librbd1-10.2.4-2.fc25.s390x
perl-Digest-MD5-2.55-2.fc25.s390x
wayland-protocols-devel-1.7-1.fc25.noarch
texi2html-5.0-4.fc24.noarch
libxkbcommon-0.7.1-1.fc25.s390x
libuuid-devel-2.28.2-2.fc25.s390x
libcacard-2.5.3-1.fc25.s390x
libwmf-lite-0.2.8.4-50.fc25.s390x
texlive-tetex-svn41059-33.fc25.1.noarch
texlive-thumbpdf-svn34621.3.16-33.fc25.1.noarch
texlive-carlisle-svn18258.0-33.fc25.1.noarch
texlive-makeindex-bin-svn40473-33.20160520.fc25.1.s390x
texlive-pdftex-svn41149-33.fc25.1.noarch
texlive-csquotes-svn39538-33.fc25.1.noarch
texlive-courier-svn35058.0-33.fc25.1.noarch
texlive-helvetic-svn31835.0-33.fc25.1.noarch
texlive-mfnfss-svn19410.0-33.fc25.1.noarch
texlive-sepnum-svn20186.2.0-33.fc25.1.noarch
texlive-utopia-svn15878.0-33.fc25.1.noarch
texlive-luatexbase-svn38550-33.fc25.1.noarch
texlive-pst-3d-svn17257.1.10-33.fc25.1.noarch
texlive-latex-bin-bin-svn14050.0-33.20160520.fc25.1.noarch
texlive-l3experimental-svn41163-33.fc25.1.noarch
net-tools-2.0-0.40.20160329git.fc25.s390x
perl-Pod-Perldoc-3.28-1.fc25.noarch
openssl-1.0.2k-1.fc25.s390x
man-pages-4.06-4.fc25.noarch
python3-magic-5.29-4.fc25.noarch
libxml2-2.9.4-2.fc25.s390x
nss-softokn-3.30.2-1.0.fc25.s390x
p11-kit-trust-0.23.2-4.fc25.s390x
emacs-filesystem-25.2-2.fc25.noarch
python3-dateutil-2.6.0-1.fc25.noarch
perl-threads-shared-1.57-1.fc25.s390x
libnotify-0.7.7-1.fc25.s390x
unzip-6.0-32.fc25.s390x
pango-devel-1.40.5-1.fc25.s390x
libdrm-2.4.81-1.fc25.s390x
python-beautifulsoup4-4.6.0-1.fc25.noarch
libcurl-7.51.0-7.fc25.s390x
dhcp-client-4.3.5-3.fc25.s390x
python2-fedora-0.9.0-6.fc25.noarch
emacs-25.2-2.fc25.s390x
gdb-7.12.1-48.fc25.s390x
expat-devel-2.2.1-1.fc25.s390x
gpg-pubkey-95a43f54-5284415a
dejavu-fonts-common-2.35-3.fc24.noarch
libSM-1.2.2-4.fc24.s390x
diffutils-3.3-13.fc24.s390x
libogg-1.3.2-5.fc24.s390x
hunspell-en-US-0.20140811.1-5.fc24.noarch
libdaemon-0.14-10.fc24.s390x
patch-2.7.5-3.fc24.s390x
libsysfs-2.1.0-19.fc24.s390x
procmail-3.22-39.fc24.s390x
libXdamage-1.1.4-8.fc24.s390x
libotf-0.9.13-7.fc24.s390x
urw-fonts-2.4-22.fc24.noarch
crontabs-1.11-12.20150630git.fc24.noarch
ppp-2.4.7-9.fc24.s390x
cyrus-sasl-2.1.26-26.2.fc24.s390x
zlib-devel-1.2.8-10.fc24.s390x
time-1.7-49.fc24.s390x
gpg-pubkey-fdb19c98-56fd6333
libcap-ng-0.7.8-1.fc25.s390x
binutils-2.26.1-1.fc25.s390x
lcms2-2.8-2.fc25.s390x
libcomps-0.1.7-5.fc25.s390x
apr-1.5.2-4.fc25.s390x
perl-constant-1.33-367.fc25.noarch
perl-Data-Dumper-2.161-1.fc25.s390x
ipcalc-0.1.8-1.fc25.s390x
gmp-c++-6.1.1-1.fc25.s390x
fontconfig-2.12.1-1.fc25.s390x
enchant-1.6.0-14.fc25.s390x
pyliblzma-0.5.3-16.fc25.s390x
libsepol-devel-2.5-10.fc25.s390x
python3-ordered-set-2.0.0-4.fc25.noarch
python-ipaddress-1.0.16-3.fc25.noarch
python2-kerberos-1.2.5-1.fc25.s390x
python2-pysocks-1.5.6-5.fc25.noarch
fipscheck-lib-1.4.1-11.fc25.s390x
libatomic_ops-7.4.4-1.fc25.s390x
net-snmp-agent-libs-5.7.3-13.fc25.s390x
dracut-044-78.fc25.s390x
python2-pygpgme-0.3-18.fc25.s390x
orc-0.4.26-1.fc25.s390x
yum-utils-1.1.31-511.fc25.noarch
libXrender-0.9.10-1.fc25.s390x
libXrandr-1.5.1-1.fc25.s390x
go-srpm-macros-2-7.fc25.noarch
gnupg2-smime-2.1.13-2.fc25.s390x
guile-devel-2.0.13-1.fc25.s390x
uboot-tools-2016.09.01-2.fc25.s390x
pykickstart-2.32-1.fc25.noarch
python-bunch-1.0.1-9.fc25.noarch
perl-generators-1.10-1.fc25.noarch
perl-Mozilla-CA-20160104-3.fc25.noarch
bzip2-libs-1.0.6-21.fc25.s390x
libpng-1.6.27-1.fc25.s390x
desktop-file-utils-0.23-2.fc25.s390x
python2-cccolutils-1.4-1.fc25.s390x
python2-lxml-3.7.2-1.fc25.s390x
redhat-rpm-config-45-1.fc25.noarch
device-mapper-event-libs-1.02.136-3.fc25.s390x
lvm2-libs-2.02.167-3.fc25.s390x
python2-gitdb-2.0.0-1.fc25.noarch
gcc-gfortran-6.3.1-1.fc25.s390x
libselinux-python-2.5-13.fc25.s390x
openjpeg2-2.1.2-3.fc25.s390x
boost-thread-1.60.0-10.fc25.s390x
librbd-devel-10.2.4-2.fc25.s390x
libXcursor-devel-1.1.14-6.fc24.s390x
latex2html-2012-7.fc24.noarch
lksctp-tools-1.0.16-5.fc24.s390x
libfdt-1.4.2-1.fc25.s390x
libXft-devel-2.3.2-4.fc24.s390x
libattr-devel-2.4.47-16.fc24.s390x
libiscsi-devel-1.15.0-2.fc24.s390x
gettext-0.19.8.1-3.fc25.s390x
libjpeg-turbo-devel-1.5.1-0.fc25.s390x
pulseaudio-libs-devel-10.0-2.fc25.s390x
libepoxy-devel-1.4.1-1.fc25.s390x
krb5-libs-1.14.4-7.fc25.s390x
libmount-2.28.2-2.fc25.s390x
python3-decorator-4.0.11-1.fc25.noarch
rpm-plugin-selinux-4.13.0.1-1.fc25.s390x
tzdata-java-2017b-1.fc25.noarch
python-srpm-macros-3-12.fc25.noarch
libsmartcols-2.28.2-2.fc25.s390x
kernel-core-4.10.5-200.fc25.s390x
kernel-modules-4.10.5-200.fc25.s390x
texlive-kpathsea-svn41139-33.fc25.1.noarch
texlive-amsmath-svn41561-33.fc25.1.noarch
texlive-thumbpdf-bin-svn6898.0-33.20160520.fc25.1.noarch
texlive-psnfss-svn33946.9.2a-33.fc25.1.noarch
texlive-subfig-svn15878.1.3-33.fc25.1.noarch
texlive-fancybox-svn18304.1.4-33.fc25.1.noarch
texlive-lua-alt-getopt-svn29349.0.7.0-33.fc25.1.noarch
texlive-natbib-svn20668.8.31b-33.fc25.1.noarch
texlive-pdftex-bin-svn40987-33.20160520.fc25.1.s390x
texlive-xdvi-svn40768-33.fc25.1.noarch
texlive-crop-svn15878.1.5-33.fc25.1.noarch
texlive-babel-english-svn30264.3.3p-33.fc25.1.noarch
texlive-cmextra-svn32831.0-33.fc25.1.noarch
texlive-fancyhdr-svn15878.3.1-33.fc25.1.noarch
texlive-luatex-svn40963-33.fc25.1.noarch
texlive-knuth-local-svn38627-33.fc25.1.noarch
texlive-mflogo-font-svn36898.1.002-33.fc25.1.noarch
texlive-parskip-svn19963.2.0-33.fc25.1.noarch
texlive-section-svn20180.0-33.fc25.1.noarch
texlive-textcase-svn15878.0-33.fc25.1.noarch
texlive-updmap-map-svn41159-33.fc25.1.noarch
texlive-attachfile-svn38830-33.fc25.1.noarch
libglvnd-glx-0.2.999-14.20170308git8e6e102.fc25.s390x
libglvnd-core-devel-0.2.999-14.20170308git8e6e102.fc25.s390x
python-magic-5.29-4.fc25.noarch
glibc-common-2.24-9.fc25.s390x
sqlite-libs-3.14.2-2.fc25.s390x
libtiff-4.0.8-1.fc25.s390x
libdb-5.3.28-24.fc25.s390x
glusterfs-client-xlators-3.10.4-1.fc25.s390x
nss-util-devel-3.30.2-1.0.fc25.s390x
gnutls-3.5.14-1.fc25.s390x
bind-license-9.10.5-2.P2.fc25.noarch
mesa-libGLES-17.0.5-3.fc25.s390x
python3-requests-kerberos-0.10.0-2.fc25.noarch
python3-pyOpenSSL-16.2.0-1.fc25.noarch
perl-threads-2.16-1.fc25.s390x
cryptsetup-libs-1.7.5-1.fc25.s390x
vim-minimal-8.0.705-1.fc25.s390x
netpbm-10.79.00-1.fc25.s390x
qrencode-libs-3.4.4-1.fc25.s390x
mariadb-config-10.1.24-3.fc25.s390x
gstreamer1-plugins-base-1.10.5-1.fc25.s390x
elfutils-default-yama-scope-0.169-1.fc25.noarch
glusterfs-3.10.4-1.fc25.s390x
systemd-udev-231-17.fc25.s390x
python2-koji-1.13.0-2.fc25.noarch
unbound-libs-1.6.3-1.fc25.s390x
openldap-2.4.44-11.fc25.s390x
koji-1.13.0-2.fc25.noarch
bind99-libs-9.9.10-2.P3.fc25.s390x
libcurl-devel-7.51.0-7.fc25.s390x
mesa-libGL-devel-17.0.5-3.fc25.s390x
python2-sssdconfig-1.15.2-5.fc25.noarch
webkitgtk4-plugin-process-gtk2-2.16.5-1.fc25.s390x
graphite2-devel-1.3.10-1.fc25.s390x
systemtap-sdt-devel-3.1-5.fc25.s390x
iproute-tc-4.11.0-1.fc25.s390x
libarchive-3.2.2-2.fc25.s390x
publicsuffix-list-dafsa-20170424-1.fc25.noarch
texlive-luaotfload-svn40902-33.fc25.1.noarch
texlive-unicode-math-svn38462-33.fc25.1.noarch
texlive-fancyvrb-svn18492.2.8-33.fc25.1.noarch
texlive-pst-pdf-bin-svn7838.0-33.20160520.fc25.1.noarch
texlive-amscls-svn36804.0-33.fc25.1.noarch
texlive-ltxmisc-svn21927.0-33.fc25.1.noarch
texlive-breqn-svn38099.0.98d-33.fc25.1.noarch
texlive-xetex-def-svn40327-33.fc25.1.noarch
openssh-server-7.4p1-4.fc25.s390x
sendmail-8.15.2-8.fc25.s390x
tzdata-2017b-1.fc25.noarch
hunspell-1.4.1-2.fc25.s390x
gpg-pubkey-8e1431d5-53bcbac7
zlib-1.2.8-10.fc24.s390x
sed-4.2.2-15.fc24.s390x
psmisc-22.21-8.fc24.s390x
gpm-libs-1.20.7-9.fc24.s390x
zip-3.0-16.fc24.s390x
libyubikey-1.13-2.fc24.s390x
sg3_utils-libs-1.41-3.fc24.s390x
polkit-pkla-compat-0.1-7.fc24.s390x
passwd-0.79-8.fc24.s390x
trousers-0.3.13-6.fc24.s390x
grubby-8.40-3.fc24.s390x
rootfiles-8.1-19.fc24.noarch
nettle-3.3-1.fc25.s390x
libksba-1.3.5-1.fc25.s390x
perl-Text-ParseWords-3.30-365.fc25.noarch
perl-PathTools-3.63-366.fc25.s390x
perl-File-Temp-0.23.04-365.fc25.noarch
fuse-libs-2.9.7-1.fc25.s390x
perl-Pod-Escapes-1.07-365.fc25.noarch
perl-Term-ANSIColor-4.05-2.fc25.noarch
perl-URI-1.71-5.fc25.noarch
libXfont-1.5.2-1.fc25.s390x
python-six-1.10.0-3.fc25.noarch
dbus-glib-0.108-1.fc25.s390x
gobject-introspection-1.50.0-1.fc25.s390x
libpwquality-1.3.0-6.fc25.s390x
python-gobject-base-3.22.0-1.fc25.s390x
python-html5lib-0.999-9.fc25.noarch
python3-dbus-1.2.4-2.fc25.s390x
python3-chardet-2.3.0-1.fc25.noarch
python3-urllib3-1.15.1-3.fc25.noarch
python-offtrac-0.1.0-7.fc25.noarch
python2-cryptography-1.5.3-3.fc25.s390x
python2-requests-kerberos-0.10.0-2.fc25.noarch
libserf-1.3.9-1.fc25.s390x
libdatrie-0.2.9-3.fc25.s390x
s390utils-base-1.36.0-1.fc25.s390x
kpartx-0.4.9-83.fc25.s390x
s390utils-cpuplugd-1.36.0-1.fc25.s390x
s390utils-osasnmpd-1.36.0-1.fc25.s390x
python-dnf-plugins-extras-common-0.0.12-4.fc25.noarch
fpc-srpm-macros-1.0-1.fc25.noarch
libuser-0.62-4.fc25.s390x
man-db-2.7.5-3.fc25.s390x
python-systemd-doc-232-1.fc25.s390x
lz4-1.7.5-1.fc25.s390x
tar-1.29-3.fc25.s390x
bodhi-client-0.9.12.2-6.fc25.noarch
cairo-1.14.8-1.fc25.s390x
gcc-go-6.3.1-1.fc25.s390x
cracklib-dicts-2.9.6-4.fc25.s390x
libselinux-python3-2.5-13.fc25.s390x
python2-enchant-1.6.8-1.fc25.noarch
boost-iostreams-1.60.0-10.fc25.s390x
userspace-rcu-0.9.2-2.fc25.s390x
libXext-devel-1.3.3-4.fc24.s390x
libXrandr-devel-1.5.1-1.fc25.s390x
perl-XML-XPath-1.39-1.fc25.noarch
python3-lxml-3.7.2-1.fc25.s390x
libiscsi-1.15.0-2.fc24.s390x
fontconfig-devel-2.12.1-1.fc25.s390x
libfdt-devel-1.4.2-1.fc25.s390x
ceph-devel-compat-10.2.4-2.fc25.s390x
zlib-static-1.2.8-10.fc24.s390x
chrpath-0.16-3.fc24.s390x
info-6.1-4.fc25.s390x
iptables-libs-1.6.0-3.fc25.s390x
libfdisk-2.28.2-2.fc25.s390x
dnf-plugins-core-0.1.21-5.fc25.noarch
perl-Storable-2.56-368.fc25.s390x
python2-decorator-4.0.11-1.fc25.noarch
libnetfilter_conntrack-1.0.6-2.fc25.s390x
texlive-texlive.infra-bin-svn40312-33.20160520.fc25.1.s390x
texlive-ifluatex-svn41346-33.fc25.1.noarch
texlive-fp-svn15878.0-33.fc25.1.noarch
texlive-latex-fonts-svn28888.0-33.fc25.1.noarch
texlive-bibtex-bin-svn40473-33.20160520.fc25.1.s390x
texlive-glyphlist-svn28576.0-33.fc25.1.noarch
texlive-marvosym-svn29349.2.2a-33.fc25.1.noarch
texlive-tex-bin-svn40987-33.20160520.fc25.1.s390x
texlive-texconfig-svn40768-33.fc25.1.noarch
texlive-wasy2-ps-svn35830.0-33.fc25.1.noarch
texlive-psfrag-svn15878.3.04-33.fc25.1.noarch
texlive-charter-svn15878.0-33.fc25.1.noarch
texlive-ec-svn25033.1.0-33.fc25.1.noarch
texlive-lineno-svn21442.4.41-33.fc25.1.noarch
texlive-hyphen-base-svn41138-33.fc25.1.noarch
texlive-manfnt-font-svn35799.0-33.fc25.1.noarch
texlive-ncntrsbk-svn31835.0-33.fc25.1.noarch
texlive-pst-math-svn34786.0.63-33.fc25.1.noarch
texlive-symbol-svn31835.0-33.fc25.1.noarch
texlive-environ-svn33821.0.3-33.fc25.1.noarch
texlive-algorithms-svn38085.0.1-33.fc25.1.noarch
kernel-core-4.10.8-200.fc25.s390x
libglvnd-devel-0.2.999-14.20170308git8e6e102.fc25.s390x
python3-hawkey-0.6.4-3.fc25.s390x
glibc-all-langpacks-2.24-9.fc25.s390x
freetype-2.6.5-9.fc25.s390x
mesa-libwayland-egl-17.0.5-3.fc25.s390x
libicu-57.1-5.fc25.s390x
nspr-devel-4.14.0-2.fc25.s390x
libnl3-cli-3.2.29-3.fc25.s390x
cups-libs-2.2.0-9.fc25.s390x
bind-libs-lite-9.10.5-2.P2.fc25.s390x
ca-certificates-2017.2.14-1.0.fc25.noarch
python3-kerberos-1.2.5-1.fc25.s390x
python3-cryptography-1.5.3-3.fc25.s390x
perl-IO-1.36-387.fc25.s390x
dhcp-libs-4.3.5-3.fc25.s390x
rsync-3.1.2-4.fc25.s390x
make-4.1-6.fc25.s390x
pcre2-devel-10.23-8.fc25.s390x
quota-4.03-8.fc25.s390x
libX11-devel-1.6.5-1.fc25.s390x
ghostscript-9.20-9.fc25.s390x
dbus-1.11.14-1.fc25.s390x
rpcbind-0.2.4-6.rc2.fc25.s390x
pyOpenSSL-16.2.0-1.fc25.noarch
glusterfs-devel-3.10.4-1.fc25.s390x
nss-tools-3.30.2-1.1.fc25.s390x
python3-pycurl-7.43.0-6.fc25.s390x
bind99-license-9.9.10-2.P3.fc25.noarch
curl-7.51.0-7.fc25.s390x
glusterfs-api-devel-3.10.4-1.fc25.s390x
python-firewall-0.4.4.5-1.fc25.noarch
netpbm-progs-10.79.00-1.fc25.s390x
libsndfile-1.0.28-3.fc25.s390x
python3-sssdconfig-1.15.2-5.fc25.noarch
wget-1.18-3.fc25.s390x
libsemanage-2.5-9.fc25.s390x
telnet-0.17-68.fc25.s390x
texlive-ifplatform-svn21156.0.4-33.fc25.1.noarch
texlive-eso-pic-svn37925.2.0g-33.fc25.1.noarch
texlive-xcolor-svn41044-33.fc25.1.noarch
texlive-pst-eps-svn15878.1.0-33.fc25.1.noarch
texlive-pst-text-svn15878.1.00-33.fc25.1.noarch
texlive-rotating-svn16832.2.16b-33.fc25.1.noarch
texlive-pdfpages-svn40638-33.fc25.1.noarch
texlive-cm-super-svn15878.0-33.fc25.1.noarch
texlive-xetex-svn41438-33.fc25.1.noarch
dnf-yum-1.1.10-6.fc25.noarch
libseccomp-devel-2.3.2-1.fc25.s390x
gpgme-1.8.0-10.fc25.s390x
apr-util-1.5.4-3.fc24.s390x
jbigkit-libs-2.1-5.fc24.s390x
pixman-0.34.0-2.fc24.s390x
dwz-0.12-2.fc24.s390x
expect-5.45-22.fc24.s390x
libsigsegv-2.10-10.fc24.s390x
fakeroot-libs-1.20.2-4.fc24.s390x
m17n-lib-1.7.0-5.fc24.s390x
libverto-0.2.6-6.fc24.s390x
libXmu-1.1.2-4.fc24.s390x
libXcursor-1.1.14-6.fc24.s390x
python-kitchen-1.2.4-2.fc24.noarch
fakeroot-1.20.2-4.fc24.s390x
blktrace-1.1.0-3.fc24.s390x
usermode-1.111-8.fc24.s390x
kbd-2.0.3-3.fc24.s390x
libaio-devel-0.3.110-6.fc24.s390x
web-assets-filesystem-5-4.fc24.noarch
libgpg-error-1.24-1.fc25.s390x
findutils-4.6.0-8.fc25.s390x
libassuan-2.4.3-1.fc25.s390x
libusbx-1.0.21-1.fc25.s390x
libxslt-1.1.28-13.fc25.s390x
libmetalink-0.1.3-1.fc25.s390x
perl-MIME-Base64-3.15-365.fc25.s390x
ncurses-6.0-6.20160709.fc25.s390x
libwayland-server-1.12.0-1.fc25.s390x
perl-Fedora-VSP-0.001-4.fc25.noarch
perl-libintl-perl-1.26-1.fc25.s390x
shadow-utils-4.2.1-11.fc25.s390x
atk-2.22.0-1.fc25.s390x
pam-1.3.0-1.fc25.s390x
harfbuzz-icu-1.3.2-1.fc25.s390x
libsecret-0.18.5-2.fc25.s390x
s390utils-iucvterm-1.36.0-1.fc25.s390x
python3-requests-2.10.0-4.fc25.noarch
pyusb-1.0.0-2.fc25.noarch
python-enum34-1.0.4-6.fc25.noarch
pyxattr-0.5.3-8.fc25.s390x
libbabeltrace-1.4.0-3.fc25.s390x
libthai-0.1.25-1.fc25.s390x
deltarpm-3.6-17.fc25.s390x
s390utils-mon_statd-1.36.0-1.fc25.s390x
device-mapper-multipath-0.4.9-83.fc25.s390x
python3-pygpgme-0.3-18.fc25.s390x
libreport-filesystem-2.8.0-1.fc25.s390x
ghc-srpm-macros-1.4.2-4.fc25.noarch
rpmdevtools-8.9-1.fc25.noarch
python-dnf-plugins-extras-migrate-0.0.12-4.fc25.noarch
perl-IO-Socket-SSL-2.038-1.fc25.noarch
perl-File-ShareDir-1.102-7.fc25.noarch
tcl-8.6.6-1.fc25.s390x
bzip2-1.0.6-21.fc25.s390x
libss-1.43.3-1.fc25.s390x
libselinux-utils-2.5-13.fc25.s390x
python3-enchant-1.6.8-1.fc25.noarch
python2-dockerfile-parse-0.0.5-7.fc25.noarch
systemd-bootchart-231-2.fc25.s390x
gcc-objc-6.3.1-1.fc25.s390x
e2fsprogs-1.43.3-1.fc25.s390x
libstdc++-static-6.3.1-1.fc25.s390x
libpng-devel-1.6.27-1.fc25.s390x
perl-XML-Parser-2.44-5.fc25.s390x
lttng-ust-2.8.1-2.fc25.s390x
libXfixes-devel-5.0.3-1.fc25.s390x
libXcomposite-devel-0.4.4-8.fc24.s390x
python3-javapackages-4.7.0-6.1.fc25.noarch
libcephfs_jni-devel-10.2.4-2.fc25.s390x
keyutils-libs-devel-1.5.9-8.fc24.s390x
harfbuzz-devel-1.3.2-1.fc25.s390x
libidn-devel-1.33-1.fc25.s390x
libnfs-1.9.8-2.fc24.s390x
libssh2-devel-1.8.0-1.fc25.s390x
qemu-sanity-check-nodeps-1.1.5-5.fc24.s390x
alsa-lib-devel-1.1.1-2.fc25.s390x
libpsl-0.17.0-1.fc25.s390x
libseccomp-2.3.2-1.fc25.s390x
copy-jdk-configs-2.2-2.fc25.noarch
json-glib-1.2.6-1.fc25.s390x
python2-dnf-1.1.10-6.fc25.noarch
python2-GitPython-2.1.3-1.fc25.noarch
texlive-tetex-bin-svn36770.0-33.20160520.fc25.1.noarch
texlive-amsfonts-svn29208.3.04-33.fc25.1.noarch
texlive-babel-svn40706-33.fc25.1.noarch
texlive-colortbl-svn29803.v1.0a-33.fc25.1.noarch
texlive-babelbib-svn25245.1.31-33.fc25.1.noarch
texlive-footmisc-svn23330.5.5b-33.fc25.1.noarch
texlive-makeindex-svn40768-33.fc25.1.noarch
texlive-plain-svn40274-33.fc25.1.noarch
texlive-texconfig-bin-svn29741.0-33.20160520.fc25.1.noarch
texlive-zapfding-svn31835.0-33.fc25.1.noarch
texlive-microtype-svn41127-33.fc25.1.noarch
texlive-bookman-svn31835.0-33.fc25.1.noarch
texlive-dvisvgm-def-svn41011-33.fc25.1.noarch
texlive-finstrut-svn21719.0.5-33.fc25.1.noarch
texlive-hyph-utf8-svn41189-33.fc25.1.noarch
texlive-lualibs-svn40370-33.fc25.1.noarch
kernel-modules-4.10.8-200.fc25.s390x
python2-hawkey-0.6.4-3.fc25.s390x
glibc-2.24-9.fc25.s390x
elfutils-libelf-0.169-1.fc25.s390x
libsoup-2.56.0-3.fc25.s390x
libnl3-3.2.29-3.fc25.s390x
gstreamer1-1.10.5-1.fc25.s390x
polkit-libs-0.113-8.fc25.s390x
libtirpc-1.0.2-0.fc25.s390x
emacs-common-25.2-2.fc25.s390x
libteam-1.27-1.fc25.s390x
python3-3.5.3-6.fc25.s390x
python3-pyasn1-0.2.3-1.fc25.noarch
perl-File-Path-2.12-366.fc25.noarch
mesa-libwayland-egl-devel-17.0.5-3.fc25.s390x
libacl-devel-2.2.52-13.fc25.s390x
lua-libs-5.3.4-3.fc25.s390x
pcre2-utf32-10.23-8.fc25.s390x
quota-nls-4.03-8.fc25.noarch
gtk3-3.22.16-1.fc25.s390x
ghostscript-x11-9.20-9.fc25.s390x
systemd-231-17.fc25.s390x
glusterfs-api-3.10.4-1.fc25.s390x
glusterfs-extra-xlators-3.10.4-1.fc25.s390x
glusterfs-server-3.10.4-1.fc25.s390x
java-1.8.0-openjdk-headless-1.8.0.131-1.b12.fc25.s390x
git-2.9.4-1.fc25.s390x
dhcp-common-4.3.5-3.fc25.noarch
python2-rpkg-1.49-5.fc25.noarch
vte291-devel-0.46.2-1.fc25.s390x
python-devel-2.7.13-2.fc25.s390x
elfutils-0.169-1.fc25.s390x
lua-5.3.4-3.fc25.s390x
python3-beautifulsoup4-4.6.0-1.fc25.noarch
libmicrohttpd-0.9.55-1.fc25.s390x
screen-4.6.1-1.fc25.s390x
strace-4.18-1.fc25.s390x
texlive-mparhack-svn15878.1.4-33.fc25.1.noarch
texlive-pspicture-svn15878.0-33.fc25.1.noarch
texlive-soul-svn15878.2.4-33.fc25.1.noarch
texlive-trimspaces-svn15878.1.1-33.fc25.1.noarch
texlive-varwidth-svn24104.0.92-33.fc25.1.noarch
texlive-geometry-svn19716.5.6-33.fc25.1.noarch
texlive-memoir-svn41203-33.fc25.1.noarch
texlive-pgf-svn40966-33.fc25.1.noarch
texlive-pst-coil-svn37377.1.07-33.fc25.1.noarch
texlive-pst-plot-svn41242-33.fc25.1.noarch
texlive-latex-bin-svn41438-33.fc25.1.noarch
texlive-ucs-svn35853.2.2-33.fc25.1.noarch
texlive-ae-svn15878.1.4-33.fc25.1.noarch
texlive-xetex-bin-svn41091-33.20160520.fc25.1.s390x
fedora-upgrade-26.1-1.fc25.noarch
fedpkg-1.28-1.fc25.noarch
perl-Thread-Queue-3.12-1.fc25.noarch
cdparanoia-libs-10.2-21.fc24.s390x
ustr-1.0.4-21.fc24.s390x
libusb-0.1.5-7.fc24.s390x
readline-devel-6.3-8.fc24.s390x
chkconfig-1.8-1.fc25.s390x
avahi-libs-0.6.32-4.fc25.s390x
perl-Unicode-Normalize-1.25-365.fc25.s390x
perl-libnet-3.10-1.fc25.noarch
perl-podlators-4.09-1.fc25.noarch
dbus-python-1.2.4-2.fc25.s390x
libgnome-keyring-3.12.0-7.fc25.s390x
python-backports-1.0-8.fc25.s390x
python-pycparser-2.14-7.fc25.noarch
plymouth-scripts-0.9.3-0.6.20160620git0e65b86c.fc25.s390x
cronie-1.5.1-2.fc25.s390x
python2-librepo-1.7.18-3.fc25.s390x
libXv-1.0.11-1.fc25.s390x
python2-ndg_httpsclient-0.4.0-4.fc25.noarch
btrfs-progs-4.6.1-1.fc25.s390x
libgcc-6.3.1-1.fc25.s390x
libgomp-6.3.1-1.fc25.s390x
perl-Encode-2.88-5.fc25.s390x
cracklib-2.9.6-4.fc25.s390x
libobjc-6.3.1-1.fc25.s390x
gcc-6.3.1-1.fc25.s390x
python3-dnf-plugin-system-upgrade-0.7.1-4.fc25.noarch
boost-random-1.60.0-10.fc25.s390x
libref_array-0.1.5-29.fc25.s390x
libXrender-devel-0.9.10-1.fc25.s390x
javapackages-tools-4.7.0-6.1.fc25.noarch
keyutils-1.5.9-8.fc24.s390x
libcom_err-devel-1.43.3-1.fc25.s390x
lzo-minilzo-2.08-8.fc24.s390x
libusbx-devel-1.0.21-1.fc25.s390x
virglrenderer-devel-0.5.0-1.20160411git61846f92f.fc25.s390x
acpica-tools-20160831-1.fc25.s390x
grep-2.27-2.fc25.s390x
dnf-conf-1.1.10-6.fc25.noarch
crypto-policies-20160921-4.gitf3018dd.fc25.noarch
rpm-build-libs-4.13.0.1-1.fc25.s390x
libnfsidmap-0.27-1.fc25.s390x
SDL2-2.0.5-3.fc25.s390x
texlive-etex-pkg-svn39355-33.fc25.1.noarch
texlive-multido-svn18302.1.42-33.fc25.1.noarch
texlive-gsftopk-svn40768-33.fc25.1.noarch
texlive-pst-ovl-svn40873-33.fc25.1.noarch
texlive-ltabptch-svn17533.1.74d-33.fc25.1.noarch
texlive-cite-svn36428.5.5-33.fc25.1.noarch
texlive-fpl-svn15878.1.002-33.fc25.1.noarch
texlive-mathpazo-svn15878.1.003-33.fc25.1.noarch
texlive-rcs-svn15878.0-33.fc25.1.noarch
texlive-type1cm-svn21820.0-33.fc25.1.noarch
texlive-l3kernel-svn41246-33.fc25.1.noarch
texlive-hyperref-svn41396-33.fc25.1.noarch
texlive-pst-tree-svn24142.1.12-33.fc25.1.noarch
texlive-sansmathaccent-svn30187.0-33.fc25.1.noarch
texlive-dvipdfmx-bin-svn40273-33.20160520.fc25.1.s390x
texlive-zapfchan-svn31835.0-33.fc25.1.noarch
glib2-static-2.50.3-1.fc25.s390x
bash-completion-2.5-1.fc25.noarch
glusterfs-libs-3.10.4-1.fc25.s390x
p11-kit-0.23.2-4.fc25.s390x
hyphen-2.8.8-4.fc24.s390x
gnutls-c++-3.5.14-1.fc25.s390x
python3-idna-2.5-1.fc25.noarch
nss-softokn-devel-3.30.2-1.0.fc25.s390x
less-481-7.fc25.s390x
rpmconf-base-1.0.19-1.fc25.noarch
gtk2-2.24.31-2.fc25.s390x
mesa-libgbm-17.0.5-3.fc25.s390x
nfs-utils-2.1.1-5.rc4.fc25.s390x
perl-Git-2.9.4-1.fc25.noarch
mock-1.4.2-1.fc25.noarch
mc-4.8.19-5.fc25.s390x
pcre-static-8.41-1.fc25.s390x
bind-libs-9.10.5-2.P2.fc25.s390x
libproxy-0.4.15-2.fc25.s390x
gpg-pubkey-a29cb19c-53bcbba6
m4-1.4.17-9.fc24.s390x
liblockfile-1.09-4.fc24.s390x
sg3_utils-1.41-3.fc24.s390x
libXinerama-1.1.3-6.fc24.s390x
libXft-2.3.2-4.fc24.s390x
tcp_wrappers-libs-7.6-83.fc25.s390x
perl-Text-Tabs+Wrap-2013.0523-365.fc25.noarch
perl-Error-0.17024-7.fc25.noarch
perl-Term-Cap-1.17-365.fc25.noarch
perl-Pod-Usage-1.69-1.fc25.noarch
device-mapper-persistent-data-0.6.3-1.fc25.s390x
net-snmp-libs-5.7.3-13.fc25.s390x
python3-six-1.10.0-3.fc25.noarch
python3-pysocks-1.5.6-5.fc25.noarch
python-chardet-2.3.0-1.fc25.noarch
python2-cffi-1.7.0-2.fc25.s390x
gc-devel-7.4.4-1.fc25.s390x
plymouth-0.9.3-0.6.20160620git0e65b86c.fc25.s390x
ebtables-2.0.10-21.fc25.s390x
python3-librepo-1.7.18-3.fc25.s390x
net-snmp-5.7.3-13.fc25.s390x
at-spi2-atk-2.22.0-1.fc25.s390x
avahi-autoipd-0.6.32-4.fc25.s390x
libgo-6.3.1-1.fc25.s390x
cpp-6.3.1-1.fc25.s390x
pyparsing-2.1.10-1.fc25.noarch
python3-pyparsing-2.1.10-1.fc25.noarch
libcollection-0.7.0-29.fc25.s390x
libcephfs-devel-10.2.4-2.fc25.s390x
libXdamage-devel-1.1.4-8.fc24.s390x
libverto-devel-0.2.6-6.fc24.s390x
snappy-1.1.3-2.fc24.s390x
cairo-gobject-devel-1.14.8-1.fc25.s390x
cyrus-sasl-devel-2.1.26-26.2.fc24.s390x
libXi-1.7.9-1.fc25.s390x
texlive-base-2016-33.20160520.fc25.noarch
python3-rpm-4.13.0.1-1.fc25.s390x
texlive-booktabs-svn40846-33.fc25.1.noarch
texlive-lm-svn28119.2.004-33.fc25.1.noarch
texlive-gsftopk-bin-svn40473-33.20160520.fc25.1.s390x
texlive-tex-svn40793-33.fc25.1.noarch
texlive-fancyref-svn15878.0.9c-33.fc25.1.noarch
texlive-chngcntr-svn17157.1.0a-33.fc25.1.noarch
texlive-fix2col-svn38770-33.fc25.1.noarch
texlive-marginnote-svn41382-33.fc25.1.noarch
texlive-pxfonts-svn15878.0-33.fc25.1.noarch
texlive-txfonts-svn15878.0-33.fc25.1.noarch
texlive-l3packages-svn41246-33.fc25.1.noarch
texlive-oberdiek-svn41346-33.fc25.1.noarch
texlive-pst-tools-svn34067.0.05-33.fc25.1.noarch
texlive-tex-gyre-svn18651.2.004-33.fc25.1.noarch
texlive-dvipdfmx-svn41149-33.fc25.1.noarch
texlive-collection-fontsrecommended-svn35830.0-33.20160520.fc25.1.noarch
libcacard-devel-2.5.3-1.fc25.s390x
ykpers-1.18.0-2.fc25.s390x
python2-idna-2.5-1.fc25.noarch
file-libs-5.29-4.fc25.s390x
policycoreutils-2.5-20.fc25.s390x
libgcrypt-1.7.8-1.fc25.s390x
pcre-8.41-1.fc25.s390x
GeoIP-1.6.11-1.fc25.s390x
ghostscript-core-9.20-9.fc25.s390x
python3-cffi-1.7.0-2.fc25.s390x
nss-softokn-freebl-devel-3.30.2-1.0.fc25.s390x
json-c-0.12.1-2.fc25.s390x
vim-common-8.0.705-1.fc25.s390x
vte291-0.46.2-1.fc25.s390x
libdrm-devel-2.4.81-1.fc25.s390x
gssproxy-0.7.0-9.fc25.s390x
git-core-doc-2.9.4-1.fc25.s390x
systemtap-3.1-5.fc25.s390x
mesa-libgbm-devel-17.0.5-3.fc25.s390x
vim-enhanced-8.0.705-1.fc25.s390x
glibc-static-2.24-9.fc25.s390x
libgusb-0.2.10-1.fc25.s390x
python-async-0.6.1-9.fc22.s390x
dejavu-sans-mono-fonts-2.35-3.fc24.noarch
popt-1.16-7.fc24.s390x
cyrus-sasl-lib-2.1.26-26.2.fc24.s390x
xz-5.2.2-2.fc24.s390x
libpipeline-1.4.1-2.fc24.s390x
pinentry-0.9.7-2.fc24.s390x
pth-2.0.7-27.fc24.s390x
libsepol-2.5-10.fc25.s390x
libxcb-1.12-1.fc25.s390x
perl-Getopt-Long-2.49.1-1.fc25.noarch
avahi-glib-0.6.32-4.fc25.s390x
python3-pip-8.1.2-2.fc25.noarch
python3-libcomps-0.1.7-5.fc25.s390x
python-slip-0.6.4-4.fc25.noarch
python2-libcomps-0.1.7-5.fc25.s390x
gc-7.4.4-1.fc25.s390x
s390utils-cmsfs-1.36.0-1.fc25.s390x
newt-python-0.52.19-2.fc25.s390x
qt5-srpm-macros-5.7.1-1.fc25.noarch
device-mapper-event-1.02.136-3.fc25.s390x
perl-Class-Inspector-1.31-2.fc25.noarch
libbasicobjects-0.1.1-29.fc25.s390x
libradosstriper1-10.2.4-2.fc25.s390x
libXxf86vm-devel-1.1.4-3.fc24.s390x
zziplib-0.13.62-7.fc24.s390x
libpaper-1.1.24-12.fc24.s390x
libini_config-1.3.0-29.fc25.s390x
snappy-devel-1.1.3-2.fc24.s390x
libcap-ng-devel-0.7.8-1.fc25.s390x
libxkbcommon-devel-0.7.1-1.fc25.s390x
openssl-libs-1.0.2k-1.fc25.s390x
libkadm5-1.14.4-7.fc25.s390x
rpm-libs-4.13.0.1-1.fc25.s390x
util-linux-2.28.2-2.fc25.s390x
texlive-etoolbox-svn38031.2.2a-33.fc25.1.noarch
texlive-dvips-svn41149-33.fc25.1.noarch
texlive-latexconfig-svn40274-33.fc25.1.noarch
texlive-tex-ini-files-svn40533-33.fc25.1.noarch
texlive-qstest-svn15878.0-33.fc25.1.noarch
texlive-cmap-svn41168-33.fc25.1.noarch
texlive-luatex-bin-svn41091-33.20160520.fc25.1.s390x
texlive-mflogo-svn38628-33.fc25.1.noarch
texlive-sansmath-svn17997.1.1-33.fc25.1.noarch
texlive-unicode-data-svn39808-33.fc25.1.noarch
texlive-luaotfload-bin-svn34647.0-33.20160520.fc25.1.noarch
texlive-listings-svn37534.1.6-33.fc25.1.noarch
texlive-pstricks-svn41321-33.fc25.1.noarch
texlive-metalogo-svn18611.0.12-33.fc25.1.noarch
texlive-collection-latex-svn41011-33.20160520.fc25.1.noarch
kernel-4.10.5-200.fc25.s390x
python2-dnf-plugins-core-0.1.21-5.fc25.noarch
xkeyboard-config-2.20-2.fc25.noarch
file-5.29-4.fc25.s390x
perl-Test-Harness-3.39-1.fc25.noarch
systemd-libs-231-17.fc25.s390x
webkitgtk4-jsc-2.16.5-1.fc25.s390x
gtk-update-icon-cache-3.22.16-1.fc25.s390x
glibc-devel-2.24-9.fc25.s390x
python3-pycparser-2.14-7.fc25.noarch
kernel-devel-4.11.10-200.fc25.s390x
gsm-1.0.17-1.fc25.s390x
vim-filesystem-8.0.705-1.fc25.s390x
webkitgtk4-2.16.5-1.fc25.s390x
python-2.7.13-2.fc25.s390x
glusterfs-fuse-3.10.4-1.fc25.s390x
git-core-2.9.4-1.fc25.s390x
selinux-policy-targeted-3.13.1-225.18.fc25.noarch
kernel-4.11.10-200.fc25.s390x
rpmconf-1.0.19-1.fc25.noarch
teamd-1.27-1.fc25.s390x
jasper-libs-1.900.13-4.fc25.s390x
libattr-2.4.47-16.fc24.s390x
libvisual-0.4.0-20.fc24.s390x
libpcap-1.7.4-2.fc24.s390x
libutempter-1.1.6-8.fc24.s390x
libgudev-230-3.fc24.s390x
popt-devel-1.16-7.fc24.s390x
hicolor-icon-theme-0.15-3.fc24.noarch
setup-2.10.4-1.fc25.noarch
bash-4.3.43-4.fc25.s390x
libjpeg-turbo-1.5.1-0.fc25.s390x
perl-Socket-2.024-1.fc25.s390x
perl-HTTP-Tiny-0.070-1.fc25.noarch
ipset-6.29-1.fc25.s390x
python2-setuptools-25.1.1-1.fc25.noarch
gsettings-desktop-schemas-3.22.0-1.fc25.s390x
python3-setuptools-25.1.1-1.fc25.noarch
python-slip-dbus-0.6.4-4.fc25.noarch
python2-ply-3.8-2.fc25.noarch
dtc-1.4.2-1.fc25.s390x
guile-2.0.13-1.fc25.s390x
cronie-anacron-1.5.1-2.fc25.s390x
libXtst-1.2.3-1.fc25.s390x
iso-codes-3.70-1.fc25.noarch
s390utils-1.36.0-1.fc25.s390x
python-backports-ssl_match_hostname-3.5.0.1-3.fc25.noarch
fedora-cert-0.6.0.1-1.fc25.noarch
libstdc++-6.3.1-1.fc25.s390x
subversion-libs-1.9.5-1.fc25.s390x
libgfortran-6.3.1-1.fc25.s390x
dnf-plugin-system-upgrade-0.7.1-4.fc25.noarch
lvm2-2.02.167-3.fc25.s390x
libselinux-devel-2.5-13.fc25.s390x
perl-Time-Local-1.250-1.fc25.noarch
libradosstriper-devel-10.2.4-2.fc25.s390x
flac-libs-1.3.2-1.fc25.s390x
perl-Digest-1.17-366.fc25.noarch
teckit-2.5.1-15.fc24.s390x
libpath_utils-0.2.1-29.fc25.s390x
attr-2.4.47-16.fc24.s390x
usbredir-0.7.1-2.fc24.s390x
cairo-devel-1.14.8-1.fc25.s390x
lzo-devel-2.08-8.fc24.s390x
libcap-devel-2.25-2.fc25.s390x
krb5-devel-1.14.4-7.fc25.s390x
rpm-4.13.0.1-1.fc25.s390x
kernel-devel-4.10.5-200.fc25.s390x
libbsd-0.8.3-1.fc25.s390x
texlive-url-svn32528.3.4-33.fc25.1.noarch
texlive-dvips-bin-svn40987-33.20160520.fc25.1.s390x
texlive-index-svn24099.4.1beta-33.fc25.1.noarch
texlive-setspace-svn24881.6.7a-33.fc25.1.noarch
texlive-mathtools-svn38833-33.fc25.1.noarch
texlive-cm-svn32865.0-33.fc25.1.noarch
texlive-graphics-def-svn41879-33.fc25.1.noarch
texlive-mdwtools-svn15878.1.05.4-33.fc25.1.noarch
texlive-rsfs-svn15878.0-33.fc25.1.noarch
texlive-ucharcat-svn38907-33.fc25.1.noarch
texlive-fontspec-svn41262-33.fc25.1.noarch
texlive-showexpl-svn32737.v0.3l-33.fc25.1.noarch
texlive-pstricks-add-svn40744-33.fc25.1.noarch
texlive-beamer-svn36461.3.36-33.fc25.1.noarch
texlive-collection-basic-svn41149-33.20160520.fc25.1.noarch
rpm-build-4.13.0.1-1.fc25.s390x
xemacs-filesystem-21.5.34-20.20170124hgf412e9f093d4.fc25.noarch
hawkey-0.6.4-3.fc25.s390x
gdk-pixbuf2-modules-2.36.6-1.fc25.s390x
bluez-libs-5.44-1.fc25.s390x
audit-libs-2.7.7-1.fc25.s390x
iproute-4.11.0-1.fc25.s390x
libICE-1.0.9-9.fc25.s390x
glibc-headers-2.24-9.fc25.s390x
python3-ply-3.8-2.fc25.noarch
perl-5.24.2-387.fc25.s390x
graphite2-1.3.10-1.fc25.s390x
vte-profile-0.46.2-1.fc25.s390x
gtk3-devel-3.22.16-1.fc25.s390x
python-libs-2.7.13-2.fc25.s390x
mesa-libGL-17.0.5-3.fc25.s390x
python2-pycurl-7.43.0-6.fc25.s390x
NetworkManager-1.4.4-5.fc25.s390x
mesa-libEGL-devel-17.0.5-3.fc25.s390x
mariadb-libs-10.1.24-3.fc25.s390x
mesa-libGLES-devel-17.0.5-3.fc25.s390x
hostname-3.15-8.fc25.s390x
gpg-pubkey-a0a7badb-52844296
readline-6.3-8.fc24.s390x
cpio-2.12-3.fc24.s390x
libXcomposite-0.4.4-8.fc24.s390x
procps-ng-3.3.10-11.fc24.s390x
GConf2-3.2.6-16.fc24.s390x
xz-devel-5.2.2-2.fc24.s390x
fedora-logos-22.0.0-3.fc24.s390x
gpg-pubkey-e372e838-56fd7943
kmod-libs-23-1.fc25.s390x
perl-parent-0.236-1.fc25.noarch
perl-TermReadKey-2.37-1.fc25.s390x
ncurses-c++-libs-6.0-6.20160709.fc25.s390x
gzip-1.8-1.fc25.s390x
python3-gobject-base-3.22.0-1.fc25.s390x
python2-yubico-1.3.2-3.fc25.noarch
s390utils-ziomon-1.36.0-1.fc25.s390x
librepo-1.7.18-3.fc25.s390x
librsvg2-2.40.16-2.fc25.s390x
gnat-srpm-macros-4-1.fc25.noarch
python-decoratortools-1.8-12.fc25.noarch
m17n-db-1.7.0-7.fc25.noarch
e2fsprogs-libs-1.43.3-1.fc25.s390x
libvorbis-1.3.5-1.fc25.s390x
gcc-gdb-plugin-6.3.1-1.fc25.s390x
npth-1.3-1.fc25.s390x
libcephfs1-10.2.4-2.fc25.s390x
wayland-devel-1.12.0-1.fc25.s390x
libxcb-devel-1.12-1.fc25.s390x
perl-encoding-2.19-5.fc25.s390x
python3-cssselect-0.9.2-1.fc25.noarch
gettext-libs-0.19.8.1-3.fc25.s390x
at-spi2-atk-devel-2.22.0-1.fc25.s390x
virglrenderer-0.5.0-1.20160411git61846f92f.fc25.s390x
pixman-devel-0.34.0-2.fc24.s390x
libnfs-devel-1.9.8-2.fc24.s390x
libblkid-2.28.2-2.fc25.s390x
glib2-devel-2.50.3-1.fc25.s390x
texlive-ifxetex-svn19685.0.5-33.fc25.1.noarch
texlive-caption-svn41409-33.fc25.1.noarch
texlive-float-svn15878.1.3d-33.fc25.1.noarch
texlive-pdftex-def-svn22653.0.06d-33.fc25.1.noarch
texlive-xdvi-bin-svn40750-33.20160520.fc25.1.s390x
texlive-beton-svn15878.0-33.fc25.1.noarch
texlive-filecontents-svn24250.1.3-33.fc25.1.noarch
texlive-lm-math-svn36915.1.959-33.fc25.1.noarch
texlive-pslatex-svn16416.0-33.fc25.1.noarch
texlive-times-svn35058.0-33.fc25.1.noarch
texlive-breakurl-svn29901.1.40-33.fc25.1.noarch
texlive-filehook-svn24280.0.5d-33.fc25.1.noarch
texlive-pst-pdf-svn31660.1.1v-33.fc25.1.noarch
texlive-seminar-svn34011.1.62-33.fc25.1.noarch
texlive-xetexconfig-svn41133-33.fc25.1.noarch
python-rpm-macros-3-12.fc25.noarch
rpm-devel-4.13.0.1-1.fc25.s390x
nss-pem-1.0.3-3.fc25.s390x
at-spi2-core-2.22.1-1.fc25.s390x
GeoIP-GeoLite-data-2017.04-1.fc25.noarch
kernel-devel-4.10.8-200.fc25.s390x
dbus-libs-1.11.14-1.fc25.s390x
perl-Scalar-List-Utils-1.48-1.fc25.s390x
libidn2-2.0.2-1.fc25.s390x
libtasn1-devel-4.12-1.fc25.s390x
python3-koji-1.13.0-2.fc25.noarch
glusterfs-cli-3.10.4-1.fc25.s390x
opus-1.1.5-1.fc25.s390x
mariadb-common-10.1.24-3.fc25.s390x
elfutils-libs-0.169-1.fc25.s390x
kernel-core-4.11.10-200.fc25.s390x
gnutls-dane-3.5.14-1.fc25.s390x
systemd-container-231-17.fc25.s390x
sudo-1.8.20p2-1.fc25.s390x
dbus-devel-1.11.14-1.fc25.s390x
perl-Module-CoreList-5.20170621-1.fc25.noarch
libicu-devel-57.1-5.fc25.s390x
js-jquery-2.2.4-3.fc25.noarch
=== TEST BEGIN ===
Using CC: /home/fam/bin/cc
Install prefix /var/tmp/patchew-tester-tmp-pe1ekf8x/src/install
BIOS directory /var/tmp/patchew-tester-tmp-pe1ekf8x/src/install/share/qemu
binary directory /var/tmp/patchew-tester-tmp-pe1ekf8x/src/install/bin
library directory /var/tmp/patchew-tester-tmp-pe1ekf8x/src/install/lib
module directory /var/tmp/patchew-tester-tmp-pe1ekf8x/src/install/lib/qemu
libexec directory /var/tmp/patchew-tester-tmp-pe1ekf8x/src/install/libexec
include directory /var/tmp/patchew-tester-tmp-pe1ekf8x/src/install/include
config directory /var/tmp/patchew-tester-tmp-pe1ekf8x/src/install/etc
local state directory /var/tmp/patchew-tester-tmp-pe1ekf8x/src/install/var
Manual directory /var/tmp/patchew-tester-tmp-pe1ekf8x/src/install/share/man
ELF interp prefix /usr/gnemul/qemu-%M
Source path /var/tmp/patchew-tester-tmp-pe1ekf8x/src
C compiler /home/fam/bin/cc
Host C compiler cc
C++ compiler c++
Objective-C compiler /home/fam/bin/cc
ARFLAGS rv
CFLAGS -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -g
QEMU_CFLAGS -I/usr/include/pixman-1 -Werror -DHAS_LIBSSH2_SFTP_FSYNC -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -DNCURSES_WIDECHAR -D_GNU_SOURCE -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wendif-labels -Wno-shift-negative-value -Wno-missing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration -Wold-style-definition -Wtype-limits -fstack-protector-strong -I/usr/include/p11-kit-1 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/cacard -I/usr/include/nss3 -I/usr/include/nspr4 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/libusb-1.0
LDFLAGS -Wl,--warn-common -m64 -g
make make
install install
python python -B
smbd /usr/sbin/smbd
module support no
host CPU s390x
host big endian yes
target list aarch64-softmmu alpha-softmmu arm-softmmu cris-softmmu i386-softmmu lm32-softmmu m68k-softmmu microblazeel-softmmu microblaze-softmmu mips64el-softmmu mips64-softmmu mipsel-softmmu mips-softmmu moxie-softmmu nios2-softmmu or1k-softmmu ppc64-softmmu ppcemb-softmmu ppc-softmmu s390x-softmmu sh4eb-softmmu sh4-softmmu sparc64-softmmu sparc-softmmu tricore-softmmu unicore32-softmmu x86_64-softmmu xtensaeb-softmmu xtensa-softmmu aarch64-linux-user alpha-linux-user armeb-linux-user arm-linux-user cris-linux-user hppa-linux-user i386-linux-user m68k-linux-user microblazeel-linux-user microblaze-linux-user mips64el-linux-user mips64-linux-user mipsel-linux-user mips-linux-user mipsn32el-linux-user mipsn32-linux-user nios2-linux-user or1k-linux-user ppc64abi32-linux-user ppc64le-linux-user ppc64-linux-user ppc-linux-user s390x-linux-user sh4eb-linux-user sh4-linux-user sparc32plus-linux-user sparc64-linux-user sparc-linux-user tilegx-linux-user x86_64-linux-user
gprof enabled no
sparse enabled no
strip binaries yes
profiler no
static build no
pixman system
SDL support yes (2.0.5)
GTK support yes (3.22.16)
GTK GL support yes
VTE support yes (0.46.2)
TLS priority NORMAL
GNUTLS support yes
GNUTLS rnd yes
libgcrypt no
libgcrypt kdf no
nettle yes (3.3)
nettle kdf yes
libtasn1 yes
curses support yes
virgl support yes
curl support yes
mingw32 support no
Audio drivers oss
Block whitelist (rw)
Block whitelist (ro)
VirtFS support yes
VNC support yes
VNC SASL support yes
VNC JPEG support yes
VNC PNG support yes
xen support no
brlapi support yes
bluez support yes
Documentation yes
PIE no
vde support no
netmap support no
Linux AIO support yes
ATTR/XATTR support yes
Install blobs yes
KVM support yes
HAX support no
TCG support yes
TCG debug enabled no
TCG interpreter no
RDMA support no
fdt support yes
preadv support yes
fdatasync yes
madvise yes
posix_madvise yes
libcap-ng support yes
vhost-net support yes
vhost-scsi support yes
vhost-vsock support yes
vhost-user support yes
Trace backends log
spice support no
rbd support yes
xfsctl support no
smartcard support yes
libusb yes
usb net redir yes
OpenGL support yes
OpenGL dmabufs yes
libiscsi support yes
libnfs support yes
build guest agent yes
QGA VSS support no
QGA w32 disk info no
QGA MSI support no
seccomp support no
coroutine backend ucontext
coroutine pool yes
debug stack usage no
crypto afalg no
GlusterFS support yes
gcov gcov
gcov enabled no
TPM support yes
libssh2 support yes
TPM passthrough no
QOM debugging yes
Live block migration yes
lzo support yes
snappy support yes
bzip2 support yes
NUMA host support no
tcmalloc support no
jemalloc support no
avx2 optimization no
replication support yes
VxHS block device no
GEN aarch64-softmmu/config-devices.mak.tmp
GEN cris-softmmu/config-devices.mak.tmp
GEN alpha-softmmu/config-devices.mak.tmp
GEN arm-softmmu/config-devices.mak.tmp
GEN cris-softmmu/config-devices.mak
GEN alpha-softmmu/config-devices.mak
GEN arm-softmmu/config-devices.mak
GEN i386-softmmu/config-devices.mak.tmp
GEN lm32-softmmu/config-devices.mak.tmp
GEN m68k-softmmu/config-devices.mak.tmp
GEN aarch64-softmmu/config-devices.mak
GEN m68k-softmmu/config-devices.mak
GEN microblazeel-softmmu/config-devices.mak.tmp
GEN lm32-softmmu/config-devices.mak
GEN microblaze-softmmu/config-devices.mak.tmp
GEN mips64el-softmmu/config-devices.mak.tmp
GEN i386-softmmu/config-devices.mak
GEN mips64-softmmu/config-devices.mak.tmp
GEN microblaze-softmmu/config-devices.mak
GEN microblazeel-softmmu/config-devices.mak
GEN mipsel-softmmu/config-devices.mak.tmp
GEN mips-softmmu/config-devices.mak.tmp
GEN mips64el-softmmu/config-devices.mak
GEN moxie-softmmu/config-devices.mak.tmp
GEN mips64-softmmu/config-devices.mak
GEN nios2-softmmu/config-devices.mak.tmp
GEN mipsel-softmmu/config-devices.mak
GEN moxie-softmmu/config-devices.mak
GEN or1k-softmmu/config-devices.mak.tmp
GEN mips-softmmu/config-devices.mak
GEN nios2-softmmu/config-devices.mak
GEN ppc64-softmmu/config-devices.mak.tmp
GEN ppcemb-softmmu/config-devices.mak.tmp
GEN ppc-softmmu/config-devices.mak.tmp
GEN or1k-softmmu/config-devices.mak
GEN s390x-softmmu/config-devices.mak.tmp
GEN s390x-softmmu/config-devices.mak
GEN ppcemb-softmmu/config-devices.mak
GEN ppc-softmmu/config-devices.mak
GEN ppc64-softmmu/config-devices.mak
GEN sh4eb-softmmu/config-devices.mak.tmp
GEN sh4-softmmu/config-devices.mak.tmp
GEN sparc64-softmmu/config-devices.mak.tmp
GEN sparc-softmmu/config-devices.mak.tmp
GEN sparc-softmmu/config-devices.mak
GEN tricore-softmmu/config-devices.mak.tmp
GEN sh4-softmmu/config-devices.mak
GEN sh4eb-softmmu/config-devices.mak
GEN unicore32-softmmu/config-devices.mak.tmp
GEN sparc64-softmmu/config-devices.mak
GEN x86_64-softmmu/config-devices.mak.tmp
GEN xtensaeb-softmmu/config-devices.mak.tmp
GEN tricore-softmmu/config-devices.mak
GEN unicore32-softmmu/config-devices.mak
GEN xtensa-softmmu/config-devices.mak.tmp
GEN aarch64-linux-user/config-devices.mak.tmp
GEN xtensaeb-softmmu/config-devices.mak
GEN xtensa-softmmu/config-devices.mak
GEN alpha-linux-user/config-devices.mak.tmp
GEN armeb-linux-user/config-devices.mak.tmp
GEN x86_64-softmmu/config-devices.mak
GEN aarch64-linux-user/config-devices.mak
GEN alpha-linux-user/config-devices.mak
GEN arm-linux-user/config-devices.mak.tmp
GEN cris-linux-user/config-devices.mak.tmp
GEN hppa-linux-user/config-devices.mak.tmp
GEN armeb-linux-user/config-devices.mak
GEN i386-linux-user/config-devices.mak.tmp
GEN arm-linux-user/config-devices.mak
GEN m68k-linux-user/config-devices.mak.tmp
GEN cris-linux-user/config-devices.mak
GEN hppa-linux-user/config-devices.mak
GEN microblazeel-linux-user/config-devices.mak.tmp
GEN i386-linux-user/config-devices.mak
GEN microblaze-linux-user/config-devices.mak.tmp
GEN mips64el-linux-user/config-devices.mak.tmp
GEN m68k-linux-user/config-devices.mak
GEN mips64-linux-user/config-devices.mak.tmp
GEN microblaze-linux-user/config-devices.mak
GEN microblazeel-linux-user/config-devices.mak
GEN mipsel-linux-user/config-devices.mak.tmp
GEN mips64-linux-user/config-devices.mak
GEN mips-linux-user/config-devices.mak.tmp
GEN mips64el-linux-user/config-devices.mak
GEN mipsn32el-linux-user/config-devices.mak.tmp
GEN mipsn32-linux-user/config-devices.mak.tmp
GEN mipsel-linux-user/config-devices.mak
GEN mips-linux-user/config-devices.mak
GEN nios2-linux-user/config-devices.mak.tmp
GEN or1k-linux-user/config-devices.mak.tmp
GEN mipsn32el-linux-user/config-devices.mak
GEN ppc64abi32-linux-user/config-devices.mak.tmp
GEN mipsn32-linux-user/config-devices.mak
GEN nios2-linux-user/config-devices.mak
GEN ppc64le-linux-user/config-devices.mak.tmp
GEN ppc64-linux-user/config-devices.mak.tmp
GEN or1k-linux-user/config-devices.mak
GEN ppc64abi32-linux-user/config-devices.mak
GEN ppc-linux-user/config-devices.mak.tmp
GEN s390x-linux-user/config-devices.mak.tmp
GEN ppc64-linux-user/config-devices.mak
GEN ppc64le-linux-user/config-devices.mak
GEN ppc-linux-user/config-devices.mak
GEN sh4eb-linux-user/config-devices.mak.tmp
GEN sh4-linux-user/config-devices.mak.tmp
GEN s390x-linux-user/config-devices.mak
GEN sparc32plus-linux-user/config-devices.mak.tmp
GEN sparc64-linux-user/config-devices.mak.tmp
GEN sh4-linux-user/config-devices.mak
GEN sparc32plus-linux-user/config-devices.mak
GEN sh4eb-linux-user/config-devices.mak
GEN sparc-linux-user/config-devices.mak.tmp
GEN tilegx-linux-user/config-devices.mak.tmp
GEN sparc64-linux-user/config-devices.mak
GEN x86_64-linux-user/config-devices.mak.tmp
GEN tilegx-linux-user/config-devices.mak
GEN config-host.h
GEN sparc-linux-user/config-devices.mak
GEN x86_64-linux-user/config-devices.mak
GEN qmp-commands.h
GEN qemu-options.def
GEN qapi-types.h
GEN qapi-visit.h
GEN qapi-event.h
GEN qmp-marshal.c
GEN qapi-types.c
GEN qapi-visit.c
GEN qapi-event.c
GEN qmp-introspect.h
GEN qmp-introspect.c
GEN trace/generated-helpers.h
GEN trace/generated-helpers-wrappers.h
GEN trace/generated-tcg-tracers.h
GEN trace/generated-helpers.c
make: *** No rule to make target 'ui/input-keymap-atset12qcode.c', needed by 'Makefile'. Stop.
make: *** Waiting for unfinished jobs....
GEN module_block.h
=== OUTPUT END ===
Test command exited with code: 2
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (15 preceding siblings ...)
2017-08-10 16:10 ` [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb no-reply
@ 2017-08-10 16:11 ` no-reply
2017-08-10 16:11 ` no-reply
` (2 subsequent siblings)
19 siblings, 0 replies; 33+ messages in thread
From: no-reply @ 2017-08-10 16:11 UTC (permalink / raw)
To: berrange; +Cc: famz, qemu-devel, kraxel
Hi,
This series failed build test on FreeBSD host. Please find the details below.
Subject: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
Type: series
Message-id: 20170810155522.31099-1-berrange@redhat.com
=== TEST SCRIPT BEGIN ===
#!/bin/sh
# Testing script will be invoked under the git checkout with
# HEAD pointing to a commit that has the patches applied on top of "base"
# branch
set -e
echo "=== ENV ==="
env
echo "=== PACKAGES ==="
pkg info
echo "=== TEST BEGIN ==="
CC=/usr/local/libexec/ccache/cc
INSTALL=$PWD/install
BUILD=$PWD/build
echo -n "Using CC: "
realpath $CC
mkdir -p $BUILD $INSTALL
SRC=$PWD
cd $BUILD
$SRC/configure --cc=$CC --prefix=$INSTALL --target-list=x86_64-softmmu
gmake -j4
# XXX: we need reliable clean up
# make check -j4 V=1
gmake install
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/150229685736.21846.2809147507731700887.stgit@bahia.lan -> patchew/150229685736.21846.2809147507731700887.stgit@bahia.lan
t [tag update] patchew/1502359588-29451-1-git-send-email-armbru@redhat.com -> patchew/1502359588-29451-1-git-send-email-armbru@redhat.com
t [tag update] patchew/1502365466-19432-1-git-send-email-thuth@redhat.com -> patchew/1502365466-19432-1-git-send-email-thuth@redhat.com
t [tag update] patchew/1502367921-17730-1-git-send-email-armbru@redhat.com -> patchew/1502367921-17730-1-git-send-email-armbru@redhat.com
t [tag update] patchew/20170808162629.32493-1-quintela@redhat.com -> patchew/20170808162629.32493-1-quintela@redhat.com
t [tag update] patchew/20170809203808.31725-1-eblake@redhat.com -> patchew/20170809203808.31725-1-eblake@redhat.com
t [tag update] patchew/20170810080108.31047-1-famz@redhat.com -> patchew/20170810080108.31047-1-famz@redhat.com
t [tag update] patchew/20170810123741.30449-1-cohuck@redhat.com -> patchew/20170810123741.30449-1-cohuck@redhat.com
* [new tag] patchew/20170810155522.31099-1-berrange@redhat.com -> patchew/20170810155522.31099-1-berrange@redhat.com
Switched to a new branch 'test'
7c26de29e6 display: convert XenInput keyboard to keycodemapdb
b9d4f633bb ui: remove qemu_input_linux_to_qcode method
b82952e02a ui: remove qemu_input_qcode_to_number method
e61e51c4c6 ui: convert GTK and SDL1 frontends to keycodemapdb
8da0073fa4 ui: convert the SDL2 frontend to keycodemapdb
f4347fae8a ui: convert cocoa frontend to keycodemapdb
0bb5e3ca3a char: convert the escc device to keycodemapdb
1524c6518c input: convert the adb device to keycodemapdb
931965df01 input: convert ps2 device to keycodemapdb
0e01238d65 input: convert virtio-input-hid device to keycodemapdb
f6ca40df3d ui: use QKeyCode exclusively in InputKeyEvent
5252b5946a ui: don't export qemu_input_event_new_key
047c3a0c37 ui: convert key events to QKeyCodes immediately
9ee7d5824f ui: convert common input code to keycodemapdb
ae5a212c48 ui: add keycodemapdb repository as a GIT submodule
=== OUTPUT BEGIN ===
=== ENV ===
LOGNAME=patchew-tester
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
PWD=/var/tmp/patchew-tester-tmp-auzl37fu/src
HOME=/home/patchew-tester
USER=patchew-tester
SHELL=/bin/sh
PATCHEW=/home/patchew-tester/patchew/patchew-cli -s http://patchew.org --nodebug
=== PACKAGES ===
bash-4.4.12_2 GNU Project's Bourne Again SHell
binutils-2.28,1 GNU binary tools
bison-3.0.4,1 Parser generator from FSF, (mostly) compatible with Yacc
ca_root_nss-3.30.2 Root certificate bundle from the Mozilla Project
ccache-3.3.4_3 Tool to minimize the compile time of C/C++ programs
curl-7.54.0 Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
cvsps-2.1_2 Create patchset information from CVS
dtc-1.4.2_1 Device Tree Compiler
expat-2.2.0_1 XML 1.0 parser written in C
gcc-5.4.0 GNU Compiler Collection 5
gcc-ecj-4.5 Eclipse Java Compiler used to build GCC Java
gettext-runtime-0.19.8.1_1 GNU gettext runtime libraries and programs
git-2.13.0 Distributed source code management tool
glib-2.46.2_5 Some useful routines of C programming (current stable version)
gmake-4.2.1_1 GNU version of 'make' utility
gmp-6.1.2 Free library for arbitrary precision arithmetic
indexinfo-0.2.6 Utility to regenerate the GNU info page index
libffi-3.2.1 Foreign Function Interface
libiconv-1.14_10 Character set conversion library
libnghttp2-1.21.0 HTTP/2.0 C Library
m4-1.4.18,1 GNU M4
mpc-1.0.3 Library of complex numbers with arbitrarily high precision
mpfr-3.1.5_1 Library for multiple-precision floating-point computations
p5-Authen-SASL-2.16_1 Perl5 module for SASL authentication
p5-Digest-HMAC-1.03_1 Perl5 interface to HMAC Message-Digest Algorithms
p5-Error-0.17024 Error/exception handling in object-oriented programming style
p5-GSSAPI-0.28_1 Perl extension providing access to the GSSAPIv2 library
pcre-8.40 Perl Compatible Regular Expressions library
perl5-5.24.1 Practical Extraction and Report Language
pixman-0.34.0 Low-level pixel manipulation library
pkg-1.10.1 Package manager
pkgconf-1.3.0,1 Utility to help to configure compiler and linker flags
python-2.7_3,2 "meta-port" for the default version of Python interpreter
python2-2_3 The "meta-port" for version 2 of the Python interpreter
python27-2.7.13_3 Interpreted object-oriented programming language
python3-3_3 The "meta-port" for version 3 of the Python interpreter
python35-3.5.3_1 Interpreted object-oriented programming language
readline-6.3.8 Library for editing command lines as they are typed
sudo-1.8.20p1 Allow others to run commands as root
=== TEST BEGIN ===
Using CC: /usr/local/bin/ccache
Install prefix /var/tmp/patchew-tester-tmp-auzl37fu/src/install
BIOS directory /var/tmp/patchew-tester-tmp-auzl37fu/src/install/share/qemu
binary directory /var/tmp/patchew-tester-tmp-auzl37fu/src/install/bin
library directory /var/tmp/patchew-tester-tmp-auzl37fu/src/install/lib
module directory /var/tmp/patchew-tester-tmp-auzl37fu/src/install/lib/qemu
libexec directory /var/tmp/patchew-tester-tmp-auzl37fu/src/install/libexec
include directory /var/tmp/patchew-tester-tmp-auzl37fu/src/install/include
config directory /var/tmp/patchew-tester-tmp-auzl37fu/src/install/etc
local state directory /var/tmp/patchew-tester-tmp-auzl37fu/src/install/var
Manual directory /var/tmp/patchew-tester-tmp-auzl37fu/src/install/share/man
ELF interp prefix /usr/gnemul/qemu-%M
Source path /var/tmp/patchew-tester-tmp-auzl37fu/src
C compiler /usr/local/libexec/ccache/cc
Host C compiler cc
C++ compiler c++
Objective-C compiler clang
ARFLAGS rv
CFLAGS -O2 -g
QEMU_CFLAGS -I/usr/local/include/pixman-1 -pthread -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include -DNCURSES_WIDECHAR -m64 -mcx16 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wno-string-plus-int -Wno-initializer-overrides -Wendif-labels -Wno-shift-negative-value -Wno-missing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-definition -Wtype-limits -fstack-protector-strong
LDFLAGS -Wl,--warn-common -m64 -g
make gmake
install install
python python -B
smbd /usr/sbin/smbd
module support no
host CPU x86_64
host big endian no
target list x86_64-softmmu
gprof enabled no
sparse enabled no
strip binaries yes
profiler no
static build no
pixman system
SDL support no
GTK support no
GTK GL support no
VTE support no
TLS priority NORMAL
GNUTLS support no
GNUTLS rnd no
libgcrypt no
libgcrypt kdf no
nettle no
nettle kdf no
libtasn1 no
curses support yes
virgl support no
curl support yes
mingw32 support no
Audio drivers oss
Block whitelist (rw)
Block whitelist (ro)
VirtFS support no
VNC support yes
VNC SASL support no
VNC JPEG support no
VNC PNG support no
xen support no
brlapi support no
bluez support no
Documentation no
PIE no
vde support no
netmap support yes
Linux AIO support no
ATTR/XATTR support no
Install blobs yes
KVM support no
HAX support no
TCG support yes
TCG debug enabled no
TCG interpreter no
RDMA support no
fdt support no
preadv support yes
fdatasync no
madvise yes
posix_madvise yes
libcap-ng support no
vhost-net support no
vhost-scsi support no
vhost-vsock support no
vhost-user support yes
Trace backends log
spice support no
rbd support no
xfsctl support no
smartcard support no
libusb yes
usb net redir no
OpenGL support no
OpenGL dmabufs no
libiscsi support no
libnfs support no
build guest agent yes
QGA VSS support no
QGA w32 disk info no
QGA MSI support no
seccomp support no
coroutine backend ucontext
coroutine pool yes
debug stack usage no
crypto afalg no
GlusterFS support no
gcov gcov
gcov enabled no
TPM support yes
libssh2 support no
TPM passthrough no
QOM debugging yes
Live block migration yes
lzo support no
snappy support no
bzip2 support yes
NUMA host support no
tcmalloc support no
jemalloc support no
avx2 optimization no
replication support yes
VxHS block device no
GEN x86_64-softmmu/config-devices.mak.tmp
GEN config-host.h
GEN qemu-options.def
GEN x86_64-softmmu/config-devices.mak
GEN qmp-commands.h
GEN qapi-types.h
GEN qapi-visit.h
GEN qapi-event.h
GEN qmp-marshal.c
GEN qapi-types.c
GEN qapi-visit.c
GEN qapi-event.c
GEN qmp-introspect.h
GEN qmp-introspect.c
GEN trace/generated-tcg-tracers.h
GEN trace/generated-helpers-wrappers.h
GEN trace/generated-helpers.h
GEN trace/generated-helpers.c
GEN module_block.h
gmake: *** No rule to make target 'ui/input-keymap-atset12qcode.c', needed by 'Makefile'. Stop.
gmake: *** Waiting for unfinished jobs....
=== OUTPUT END ===
Test command exited with code: 2
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (16 preceding siblings ...)
2017-08-10 16:11 ` no-reply
@ 2017-08-10 16:11 ` no-reply
2017-08-10 16:12 ` no-reply
2017-08-21 13:53 ` Gerd Hoffmann
19 siblings, 0 replies; 33+ messages in thread
From: no-reply @ 2017-08-10 16:11 UTC (permalink / raw)
To: berrange; +Cc: famz, qemu-devel, kraxel
Hi,
This series failed automatic build test. Please find the testing commands and
their output below. If you have docker installed, you can probably reproduce it
locally.
Message-id: 20170810155522.31099-1-berrange@redhat.com
Subject: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
set -e
git submodule update --init dtc
# Let docker tests dump environment info
export SHOW_ENV=1
export J=8
time make docker-test-quick@centos6
time make docker-test-build@min-glib
time make docker-test-mingw@fedora
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/150229685736.21846.2809147507731700887.stgit@bahia.lan -> patchew/150229685736.21846.2809147507731700887.stgit@bahia.lan
t [tag update] patchew/1502359588-29451-1-git-send-email-armbru@redhat.com -> patchew/1502359588-29451-1-git-send-email-armbru@redhat.com
t [tag update] patchew/1502365466-19432-1-git-send-email-thuth@redhat.com -> patchew/1502365466-19432-1-git-send-email-thuth@redhat.com
t [tag update] patchew/1502367921-17730-1-git-send-email-armbru@redhat.com -> patchew/1502367921-17730-1-git-send-email-armbru@redhat.com
t [tag update] patchew/20170808162629.32493-1-quintela@redhat.com -> patchew/20170808162629.32493-1-quintela@redhat.com
t [tag update] patchew/20170809203808.31725-1-eblake@redhat.com -> patchew/20170809203808.31725-1-eblake@redhat.com
t [tag update] patchew/20170810080108.31047-1-famz@redhat.com -> patchew/20170810080108.31047-1-famz@redhat.com
* [new tag] patchew/20170810155522.31099-1-berrange@redhat.com -> patchew/20170810155522.31099-1-berrange@redhat.com
Switched to a new branch 'test'
7c26de29e6 display: convert XenInput keyboard to keycodemapdb
b9d4f633bb ui: remove qemu_input_linux_to_qcode method
b82952e02a ui: remove qemu_input_qcode_to_number method
e61e51c4c6 ui: convert GTK and SDL1 frontends to keycodemapdb
8da0073fa4 ui: convert the SDL2 frontend to keycodemapdb
f4347fae8a ui: convert cocoa frontend to keycodemapdb
0bb5e3ca3a char: convert the escc device to keycodemapdb
1524c6518c input: convert the adb device to keycodemapdb
931965df01 input: convert ps2 device to keycodemapdb
0e01238d65 input: convert virtio-input-hid device to keycodemapdb
f6ca40df3d ui: use QKeyCode exclusively in InputKeyEvent
5252b5946a ui: don't export qemu_input_event_new_key
047c3a0c37 ui: convert key events to QKeyCodes immediately
9ee7d5824f ui: convert common input code to keycodemapdb
ae5a212c48 ui: add keycodemapdb repository as a GIT submodule
=== OUTPUT BEGIN ===
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into '/var/tmp/patchew-tester-tmp-b0_jr94m/src/dtc'...
Submodule path 'dtc': checked out '558cd81bdd432769b59bff01240c44f82cfb1a9d'
BUILD centos6
make[1]: Entering directory '/var/tmp/patchew-tester-tmp-b0_jr94m/src'
ARCHIVE qemu.tgz
ARCHIVE dtc.tgz
COPY RUNNER
RUN test-quick in qemu:centos6
Packages installed:
SDL-devel-1.2.14-7.el6_7.1.x86_64
bison-2.4.1-5.el6.x86_64
ccache-3.1.6-2.el6.x86_64
epel-release-6-8.noarch
flex-2.5.35-9.el6.x86_64
gcc-4.4.7-18.el6.x86_64
git-1.7.1-8.el6.x86_64
glib2-devel-2.28.8-9.el6.x86_64
libfdt-devel-1.4.0-1.el6.x86_64
make-3.81-23.el6.x86_64
package g++ is not installed
pixman-devel-0.32.8-1.el6.x86_64
tar-1.23-15.el6_8.x86_64
zlib-devel-1.2.3-29.el6.x86_64
Environment variables:
PACKAGES=libfdt-devel ccache tar git make gcc g++ flex bison zlib-devel glib2-devel SDL-devel pixman-devel epel-release
HOSTNAME=01405751235b
TERM=xterm
MAKEFLAGS= -j8
HISTSIZE=1000
J=8
USER=root
LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=01;05;37;41:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.tbz=01;31:*.tbz2=01;31:*.bz=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=01;36:*.au=01;36:*.flac=01;36:*.mid=01;36:*.midi=01;36:*.mka=01;36:*.mp3=01;36:*.mpc=01;36:*.ogg=01;36:*.ra=01;36:*.wav=01;36:*.axa=01;36:*.oga=01;36:*.spx=01;36:*.xspf=01;36:
CCACHE_DIR=/var/tmp/ccache
EXTRA_CONFIGURE_OPTS=
V=
SHOW_ENV=1
MAIL=/var/spool/mail/root
PATH=/usr/lib/ccache:/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
PWD=/
LANG=en_US.UTF-8
TARGET_LIST=
HISTCONTROL=ignoredups
SHLVL=1
HOME=/root
TEST_DIR=/tmp/qemu-test
LOGNAME=root
LESSOPEN=||/usr/bin/lesspipe.sh %s
FEATURES= dtc
DEBUG=
G_BROKEN_FILENAMES=1
CCACHE_HASHDIR=
_=/usr/bin/env
Configure options:
--enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/var/tmp/qemu-build/install
No C++ compiler available; disabling C++ specific optional code
Install prefix /var/tmp/qemu-build/install
BIOS directory /var/tmp/qemu-build/install/share/qemu
binary directory /var/tmp/qemu-build/install/bin
library directory /var/tmp/qemu-build/install/lib
module directory /var/tmp/qemu-build/install/lib/qemu
libexec directory /var/tmp/qemu-build/install/libexec
include directory /var/tmp/qemu-build/install/include
config directory /var/tmp/qemu-build/install/etc
local state directory /var/tmp/qemu-build/install/var
Manual directory /var/tmp/qemu-build/install/share/man
ELF interp prefix /usr/gnemul/qemu-%M
Source path /tmp/qemu-test/src
C compiler cc
Host C compiler cc
C++ compiler
Objective-C compiler cc
ARFLAGS rv
CFLAGS -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -g
QEMU_CFLAGS -I/usr/include/pixman-1 -I$(SRC_PATH)/dtc/libfdt -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -fPIE -DPIE -m64 -mcx16 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wendif-labels -Wno-missing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration -Wold-style-definition -Wtype-limits -fstack-protector-all
LDFLAGS -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -pie -m64 -g
make make
install install
python python -B
smbd /usr/sbin/smbd
module support no
host CPU x86_64
host big endian no
target list x86_64-softmmu aarch64-softmmu
gprof enabled no
sparse enabled no
strip binaries yes
profiler no
static build no
pixman system
SDL support yes (1.2.14)
GTK support no
GTK GL support no
VTE support no
TLS priority NORMAL
GNUTLS support no
GNUTLS rnd no
libgcrypt no
libgcrypt kdf no
nettle no
nettle kdf no
libtasn1 no
curses support no
virgl support no
curl support no
mingw32 support no
Audio drivers oss
Block whitelist (rw)
Block whitelist (ro)
VirtFS support no
VNC support yes
VNC SASL support no
VNC JPEG support no
VNC PNG support no
xen support no
brlapi support no
bluez support no
Documentation no
PIE yes
vde support no
netmap support no
Linux AIO support no
ATTR/XATTR support yes
Install blobs yes
KVM support yes
HAX support no
TCG support yes
TCG debug enabled no
TCG interpreter no
RDMA support no
fdt support yes
preadv support yes
fdatasync yes
madvise yes
posix_madvise yes
libcap-ng support no
vhost-net support yes
vhost-scsi support yes
vhost-vsock support yes
vhost-user support yes
Trace backends log
spice support no
rbd support no
xfsctl support no
smartcard support no
libusb no
usb net redir no
OpenGL support no
OpenGL dmabufs no
libiscsi support no
libnfs support no
build guest agent yes
QGA VSS support no
QGA w32 disk info no
QGA MSI support no
seccomp support no
coroutine backend ucontext
coroutine pool yes
debug stack usage no
crypto afalg no
GlusterFS support no
gcov gcov
gcov enabled no
TPM support yes
libssh2 support no
TPM passthrough yes
QOM debugging yes
Live block migration yes
lzo support no
snappy support no
bzip2 support no
NUMA host support no
tcmalloc support no
jemalloc support no
avx2 optimization no
replication support yes
VxHS block device no
mkdir -p dtc/libfdt
mkdir -p dtc/tests
GEN x86_64-softmmu/config-devices.mak.tmp
GEN aarch64-softmmu/config-devices.mak.tmp
GEN qemu-options.def
GEN config-host.h
GEN qmp-commands.h
GEN qapi-visit.h
GEN qapi-types.h
GEN qapi-event.h
GEN x86_64-softmmu/config-devices.mak
GEN aarch64-softmmu/config-devices.mak
GEN qmp-marshal.c
GEN qapi-types.c
GEN qapi-visit.c
GEN qapi-event.c
GEN qmp-introspect.h
GEN qmp-introspect.c
GEN trace/generated-tcg-tracers.h
GEN trace/generated-helpers-wrappers.h
GEN trace/generated-helpers.h
GEN trace/generated-helpers.c
GEN module_block.h
make: *** No rule to make target `ui/input-keymap-atset12qcode.c', needed by `Makefile'. Stop.
make: *** Waiting for unfinished jobs....
Traceback (most recent call last):
File "./tests/docker/docker.py", line 382, in <module>
sys.exit(main())
File "./tests/docker/docker.py", line 379, in main
return args.cmdobj.run(args, argv)
File "./tests/docker/docker.py", line 237, in run
return Docker().run(argv, args.keep, quiet=args.quiet)
File "./tests/docker/docker.py", line 205, in run
quiet=quiet)
File "./tests/docker/docker.py", line 123, in _do_check
return subprocess.check_call(self._command + cmd, **kwargs)
File "/usr/lib64/python2.7/subprocess.py", line 186, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['docker', 'run', '--label', 'com.qemu.instance.uuid=6b599a1c7de611e783ce52540069c830', '-u', '0', '-t', '--rm', '--net=none', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=8', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/var/tmp/patchew-tester-tmp-b0_jr94m/src/docker-src.2017-08-10-12.10.21.1809:/var/tmp/qemu:z,ro', '-v', '/root/.cache/qemu-docker-ccache:/var/tmp/ccache:z', 'qemu:centos6', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2
make[1]: *** [tests/docker/Makefile.include:139: docker-run] Error 1
make[1]: Leaving directory '/var/tmp/patchew-tester-tmp-b0_jr94m/src'
make: *** [tests/docker/Makefile.include:168: docker-run-test-quick@centos6] Error 2
real 1m25.619s
user 0m5.178s
sys 0m1.712s
=== OUTPUT END ===
Test command exited with code: 2
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (17 preceding siblings ...)
2017-08-10 16:11 ` no-reply
@ 2017-08-10 16:12 ` no-reply
2017-08-21 13:53 ` Gerd Hoffmann
19 siblings, 0 replies; 33+ messages in thread
From: no-reply @ 2017-08-10 16:12 UTC (permalink / raw)
To: berrange; +Cc: famz, qemu-devel, kraxel
Hi,
This series seems to have some coding style problems. See output below for
more information:
Message-id: 20170810155522.31099-1-berrange@redhat.com
Subject: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0
git config --local diff.renamelimit 0
git config --local diff.renames True
commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
failed=1
echo
fi
n=$((n+1))
done
exit $failed
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/1502380961-16398-2-git-send-email-groug@kaod.org -> patchew/1502380961-16398-2-git-send-email-groug@kaod.org
Switched to a new branch 'test'
7c26de29e6 display: convert XenInput keyboard to keycodemapdb
b9d4f633bb ui: remove qemu_input_linux_to_qcode method
b82952e02a ui: remove qemu_input_qcode_to_number method
e61e51c4c6 ui: convert GTK and SDL1 frontends to keycodemapdb
8da0073fa4 ui: convert the SDL2 frontend to keycodemapdb
f4347fae8a ui: convert cocoa frontend to keycodemapdb
0bb5e3ca3a char: convert the escc device to keycodemapdb
1524c6518c input: convert the adb device to keycodemapdb
931965df01 input: convert ps2 device to keycodemapdb
0e01238d65 input: convert virtio-input-hid device to keycodemapdb
f6ca40df3d ui: use QKeyCode exclusively in InputKeyEvent
5252b5946a ui: don't export qemu_input_event_new_key
047c3a0c37 ui: convert key events to QKeyCodes immediately
9ee7d5824f ui: convert common input code to keycodemapdb
ae5a212c48 ui: add keycodemapdb repository as a GIT submodule
=== OUTPUT BEGIN ===
Checking PATCH 1/15: ui: add keycodemapdb repository as a GIT submodule...
Checking PATCH 2/15: ui: convert common input code to keycodemapdb...
Checking PATCH 3/15: ui: convert key events to QKeyCodes immediately...
Checking PATCH 4/15: ui: don't export qemu_input_event_new_key...
Checking PATCH 5/15: ui: use QKeyCode exclusively in InputKeyEvent...
WARNING: line over 80 characters
#361: FILE: ui/input.c:380:
+void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode qcode, bool down)
total: 0 errors, 1 warnings, 321 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 6/15: input: convert virtio-input-hid device to keycodemapdb...
Checking PATCH 7/15: input: convert ps2 device to keycodemapdb...
Checking PATCH 8/15: input: convert the adb device to keycodemapdb...
Checking PATCH 9/15: char: convert the escc device to keycodemapdb...
Checking PATCH 10/15: ui: convert cocoa frontend to keycodemapdb...
Checking PATCH 11/15: ui: convert the SDL2 frontend to keycodemapdb...
WARNING: line over 80 characters
#101: FILE: ui/sdl2-input.c:40:
+ for (i = 0; i < SDL_NUM_SCANCODES && i < qemu_input_map_usb2qcode_len ; i++) {
total: 0 errors, 1 warnings, 56 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 12/15: ui: convert GTK and SDL1 frontends to keycodemapdb...
ERROR: unnecessary whitespace before a quoted newline
#279: FILE: ui/gtk.c:1149:
+ g_warning("experimental: using broadway, x11 virtual keysym \n"
ERROR: unnecessary whitespace before a quoted newline
#280: FILE: ui/gtk.c:1150:
+ "mapping - with very limited support. See also \n"
ERROR: braces {} are necessary for all arms of this statement
#301: FILE: ui/gtk.c:1170:
+ if (!keycode_map)
[...]
ERROR: braces {} are necessary for all arms of this statement
#303: FILE: ui/gtk.c:1172:
+ if (scancode > keycode_maplen)
[...]
ERROR: braces {} are necessary for all arms of this statement
#550: FILE: ui/sdl.c:245:
+ if (!keycode_map)
[...]
ERROR: braces {} are necessary for all arms of this statement
#552: FILE: ui/sdl.c:247:
+ if (ev->keysym.scancode > keycode_maplen)
[...]
ERROR: braces {} are necessary for all arms of this statement
#797: FILE: ui/x_keymap.c:27:
+ if (strstr(vendor, "Cygwin/X"))
[...]
ERROR: braces {} are necessary for all arms of this statement
#813: FILE: ui/x_keymap.c:41:
+ if (strcmp(extensions[i], "Apple-WM") == 0 ||
[...]
ERROR: braces {} are necessary for all arms of this statement
#817: FILE: ui/x_keymap.c:45:
+ if (extensions)
[...]
total: 9 errors, 0 warnings, 833 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 13/15: ui: remove qemu_input_qcode_to_number method...
Checking PATCH 14/15: ui: remove qemu_input_linux_to_qcode method...
Checking PATCH 15/15: display: convert XenInput keyboard to keycodemapdb...
=== OUTPUT END ===
Test command exited with code: 1
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
2017-08-10 16:10 ` [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb no-reply
@ 2017-08-10 16:59 ` Daniel P. Berrange
0 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-10 16:59 UTC (permalink / raw)
To: qemu-devel; +Cc: famz, kraxel
On Thu, Aug 10, 2017 at 09:10:51AM -0700, no-reply@patchew.org wrote:
> Hi,
>
> This series failed build test on s390x host. Please find the details below.
>
> Subject: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
> Type: series
> Message-id: 20170810155522.31099-1-berrange@redhat.com
>
> GEN trace/generated-helpers.h
> GEN trace/generated-helpers-wrappers.h
> GEN trace/generated-tcg-tracers.h
> GEN trace/generated-helpers.c
> make: *** No rule to make target 'ui/input-keymap-atset12qcode.c', needed by 'Makefile'. Stop.
> make: *** Waiting for unfinished jobs....
Opps, failure due to me not testing non-srcdir builds.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 01/15] ui: add keycodemapdb repository as a GIT submodule
2017-08-10 15:55 ` [Qemu-devel] [PATCH 01/15] ui: add keycodemapdb repository as a GIT submodule Daniel P. Berrange
@ 2017-08-10 18:23 ` Eric Blake
2017-08-11 9:07 ` Daniel P. Berrange
0 siblings, 1 reply; 33+ messages in thread
From: Eric Blake @ 2017-08-10 18:23 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel; +Cc: Gerd Hoffmann
[-- Attachment #1: Type: text/plain, Size: 1961 bytes --]
On 08/10/2017 10:55 AM, Daniel P. Berrange wrote:
> The https://gitlab.com/keycodemap/keycodemapdb/ repo contains a
> data file mapping between all the different scancode/keycode/keysym
> sets that are known, and a tool to auto-generate lookup tables for
> different combinations.
>
> It is used by GTK-VNC, SPICE-GTK and libvirt for mapping keys.
> Using it in QEMU will let us replace many hand written lookup
> tables with auto-generated tables from a master data source,
> reducing bugs. Adding new QKeyCodes will now only require the
> master table to be updated, all ~20 other tables will be
> automatically updated to follow.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> +
> +ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) ui/Makefile.objs
> + $(call quiet-command,\
> + $(PYTHON) $(KEYCODEMAP_GEN) \
> + --lang glib2 \
> + --varname qemu_input_map_$$(echo $@ | sed -e "s,^ui/input-keymap-,," -e "s,\.c$$,,") \
> + code-map $(KEYCODEMAP_CSV) \
> + $$(echo $@ | sed -E -e "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\1,") \
> + $$(echo $@ | sed -E -e "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\2,") \
Can this text transformation be done using intrinsic make functions,
instead of requiring the shell to spawn external processes?
The regex looks fragile: if we ever have one keymap named '2abc' and
another named 'xyz2', then the input-keymap-xyz222abc may be difficult
to extract based on greedy matching favoring 'xyz22' 2 'abc'. Would it
be better to have 'xyz2-to-2abc' as the preferred naming in the
keycodemapdb project, to make sure the conversion names are unambiguous?
But as this is dependent on keymap names, I don't think it's a
showstopper for this patch.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 02/15] ui: convert common input code to keycodemapdb
2017-08-10 15:55 ` [Qemu-devel] [PATCH 02/15] ui: convert common input code to keycodemapdb Daniel P. Berrange
@ 2017-08-10 18:59 ` Eric Blake
2017-08-11 9:12 ` Daniel P. Berrange
0 siblings, 1 reply; 33+ messages in thread
From: Eric Blake @ 2017-08-10 18:59 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel; +Cc: Gerd Hoffmann
[-- Attachment #1: Type: text/plain, Size: 3020 bytes --]
On 08/10/2017 10:55 AM, Daniel P. Berrange wrote:
> Replace the number_to_qcode, qcode_to_number and linux_to_qcode
> tables with automatically generated tables.
>
> Missing entries in linux_to_qcode now fixed:
> In additionsome fixes:
s/additionsome/addition, some/
>
> - KEY_PLAYPAUSE now maps to Q_KEY_CODE_AUDIOPLAY, instead of
> KEY_PLAYCD. KEY_PLAYPAUSE is defined across almost all scancodes
> sets, while KEY_PLAYCD only appears in AT set1, so the former is
> a more useful mapping.
>
> Missing entries in qcode_to_number now fixed:
>
> Q_KEY_CODE_AGAIN -> 0x85
I didn't research that these mappings are correct in relation to an
official documentation, but trust that you have done due diligence.
> In addition some fixes:
>
> - Q_KEY_CODE_MENU was incorrectly mapped to the compose
> scancode (0xdd) and is now mapped to 0x9e
> - Q_KEY_CODE_FIND was mapped to 0xe065 (Search) instead
> of to 0xe041 (Find)
> - Q_KEY_CODE_HIRAGANA was mapped to 0x70 (Katakanahiragana)
> instead of of 0x77 (Hirigana)
> - Q_KEY_CODE_PRINT was mapped to 0xb7 which is not a defined
> scan code in AT set 1, it is now mapped to 0x54 (sysrq)
>
Are any of these fixes something we need in 2.10 (more likely, as manual
fixes rather than via the git submodule)? At this point, though, I'm
inclined to say we're deep enough in freeze that if it is not a
regression over 2.9 behavior, it's not worth rushing in the fix to 2.10.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> include/ui/input.h | 11 +-
> ui/Makefile.objs | 3 +
> ui/input-keymap.c | 326 +++--------------------------------------------------
> 3 files changed, 28 insertions(+), 312 deletions(-)
>
> +++ b/ui/Makefile.objs
> @@ -54,6 +54,9 @@ KEYCODEMAP_GEN = ui/keycodemapdb/tools/keymap-gen
> KEYCODEMAP_CSV = ui/keycodemapdb/data/keymaps.csv
>
> KEYCODEMAP_FILES = \
> + ui/input-keymap-linux2qcode.c \
> + ui/input-keymap-qcode2qnum.c \
> + ui/input-keymap-qnum2qcode.c \
My comment on patch 1 complained about regex of [a-zA-Z0-9] - do any of
the keycode names have digits, or can you shorten the regex to [a-zA-Z]?
> -
> -static int number_to_qcode[0x100];
> +#include "ui/input-keymap-linux2qcode.c"
> +#include "ui/input-keymap-qcode2qnum.c"
> +#include "ui/input-keymap-qnum2qcode.c"
>
> int qemu_input_linux_to_qcode(unsigned int lnx)
> {
> - assert(lnx < KEY_CNT);
> - return linux_to_qcode[lnx];
The old code asserted on an out-of-range input,
> + if (lnx >= qemu_input_map_linux2qcode_len) {
> + return 0;
> + }
> + return qemu_input_map_linux2qcode[lnx];
the new code returns 0. I guess that's okay, though, since the
generated table uses 0 for invalid entries, and there's no implicit
reason why out-of-range input has to assert.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 05/15] ui: use QKeyCode exclusively in InputKeyEvent
2017-08-10 15:55 ` [Qemu-devel] [PATCH 05/15] ui: use QKeyCode exclusively in InputKeyEvent Daniel P. Berrange
@ 2017-08-10 19:02 ` Eric Blake
2017-08-11 9:13 ` Daniel P. Berrange
0 siblings, 1 reply; 33+ messages in thread
From: Eric Blake @ 2017-08-10 19:02 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel; +Cc: Gerd Hoffmann
[-- Attachment #1: Type: text/plain, Size: 906 bytes --]
On 08/10/2017 10:55 AM, Daniel P. Berrange wrote:
> Now that keycode numbers are converted to QKeyCodes immediately
> when creating input events, the InputKeyEvent struct can be
> changed to only accept a QKeyCode, instead of a KeyValue.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> +++ b/qapi-schema.json
> @@ -5747,7 +5747,7 @@
> # Since: 2.0
> ##
> { 'struct' : 'InputKeyEvent',
> - 'data' : { 'key' : 'KeyValue',
> + 'data' : { 'key' : 'QKeyCode',
> 'down' : 'bool' } }
Isn't this going to break backwards-compatibility of 'input-send-event'?
I think you have to keep the public API the same, even if you make the
conversion as early as possible to the preferred mapping form internally.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 03/15] ui: convert key events to QKeyCodes immediately
2017-08-10 15:55 ` [Qemu-devel] [PATCH 03/15] ui: convert key events to QKeyCodes immediately Daniel P. Berrange
@ 2017-08-10 19:11 ` Eric Blake
0 siblings, 0 replies; 33+ messages in thread
From: Eric Blake @ 2017-08-10 19:11 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel; +Cc: Gerd Hoffmann
[-- Attachment #1: Type: text/plain, Size: 1209 bytes --]
On 08/10/2017 10:55 AM, Daniel P. Berrange wrote:
> Always use QKeyCode in the InputKeyEvent struct, by converting key
> numbers to QKeyCode at the time the event is created.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> ui/input.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
Reviewed-by: Eric Blake <eblake@redhat.com>
> diff --git a/ui/input.c b/ui/input.c
> index af05f06368..64e9103a61 100644
> --- a/ui/input.c
> +++ b/ui/input.c
> @@ -400,10 +400,8 @@ void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down)
>
> void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down)
> {
> - KeyValue *key = g_new0(KeyValue, 1);
> - key->type = KEY_VALUE_KIND_NUMBER;
> - key->u.number.data = num;
> - qemu_input_event_send_key(src, key, down);
> + QKeyCode code = qemu_input_key_number_to_qcode(num);
> + qemu_input_event_send_key_qcode(src, code, down);
> }
>
> void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down)
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 01/15] ui: add keycodemapdb repository as a GIT submodule
2017-08-10 18:23 ` Eric Blake
@ 2017-08-11 9:07 ` Daniel P. Berrange
0 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-11 9:07 UTC (permalink / raw)
To: Eric Blake; +Cc: qemu-devel, Gerd Hoffmann
On Thu, Aug 10, 2017 at 01:23:08PM -0500, Eric Blake wrote:
> On 08/10/2017 10:55 AM, Daniel P. Berrange wrote:
> > The https://gitlab.com/keycodemap/keycodemapdb/ repo contains a
> > data file mapping between all the different scancode/keycode/keysym
> > sets that are known, and a tool to auto-generate lookup tables for
> > different combinations.
> >
> > It is used by GTK-VNC, SPICE-GTK and libvirt for mapping keys.
> > Using it in QEMU will let us replace many hand written lookup
> > tables with auto-generated tables from a master data source,
> > reducing bugs. Adding new QKeyCodes will now only require the
> > master table to be updated, all ~20 other tables will be
> > automatically updated to follow.
> >
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
>
> > +
> > +ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) ui/Makefile.objs
> > + $(call quiet-command,\
> > + $(PYTHON) $(KEYCODEMAP_GEN) \
> > + --lang glib2 \
> > + --varname qemu_input_map_$$(echo $@ | sed -e "s,^ui/input-keymap-,," -e "s,\.c$$,,") \
> > + code-map $(KEYCODEMAP_CSV) \
> > + $$(echo $@ | sed -E -e "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\1,") \
> > + $$(echo $@ | sed -E -e "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\2,") \
>
> Can this text transformation be done using intrinsic make functions,
> instead of requiring the shell to spawn external processes?
Suggestions welcome :-)
> The regex looks fragile: if we ever have one keymap named '2abc' and
> another named 'xyz2', then the input-keymap-xyz222abc may be difficult
> to extract based on greedy matching favoring 'xyz22' 2 'abc'. Would it
> be better to have 'xyz2-to-2abc' as the preferred naming in the
> keycodemapdb project, to make sure the conversion names are unambiguous?
The names may end in a digit, but they won't start in a digit, so
its unambiguous
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 02/15] ui: convert common input code to keycodemapdb
2017-08-10 18:59 ` Eric Blake
@ 2017-08-11 9:12 ` Daniel P. Berrange
0 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-11 9:12 UTC (permalink / raw)
To: Eric Blake; +Cc: qemu-devel, Gerd Hoffmann
On Thu, Aug 10, 2017 at 01:59:09PM -0500, Eric Blake wrote:
> On 08/10/2017 10:55 AM, Daniel P. Berrange wrote:
> > Replace the number_to_qcode, qcode_to_number and linux_to_qcode
> > tables with automatically generated tables.
> >
> > Missing entries in linux_to_qcode now fixed:
>
> > In additionsome fixes:
>
> s/additionsome/addition, some/
>
> >
> > - KEY_PLAYPAUSE now maps to Q_KEY_CODE_AUDIOPLAY, instead of
> > KEY_PLAYCD. KEY_PLAYPAUSE is defined across almost all scancodes
> > sets, while KEY_PLAYCD only appears in AT set1, so the former is
> > a more useful mapping.
> >
> > Missing entries in qcode_to_number now fixed:
> >
> > Q_KEY_CODE_AGAIN -> 0x85
>
> I didn't research that these mappings are correct in relation to an
> official documentation, but trust that you have done due diligence.
As mentioned in the cover letter, I compared the original mapping
tables in QEMU to the new auto-generated ones. That is how I
identified these newly added entries. I also discovered certain
bugs in doing that, which I fixed in the keycodemapdb.
>
> > In addition some fixes:
> >
> > - Q_KEY_CODE_MENU was incorrectly mapped to the compose
> > scancode (0xdd) and is now mapped to 0x9e
> > - Q_KEY_CODE_FIND was mapped to 0xe065 (Search) instead
> > of to 0xe041 (Find)
> > - Q_KEY_CODE_HIRAGANA was mapped to 0x70 (Katakanahiragana)
> > instead of of 0x77 (Hirigana)
> > - Q_KEY_CODE_PRINT was mapped to 0xb7 which is not a defined
> > scan code in AT set 1, it is now mapped to 0x54 (sysrq)
> >
>
> Are any of these fixes something we need in 2.10 (more likely, as manual
> fixes rather than via the git submodule)? At this point, though, I'm
> inclined to say we're deep enough in freeze that if it is not a
> regression over 2.9 behavior, it's not worth rushing in the fix to 2.10.
These bugs have been present for several relesaes, so I'm not sure
its worth the effort to manually update the existing tables with
bug fixes.
> > KEYCODEMAP_FILES = \
> > + ui/input-keymap-linux2qcode.c \
> > + ui/input-keymap-qcode2qnum.c \
> > + ui/input-keymap-qnum2qcode.c \
>
> My comment on patch 1 complained about regex of [a-zA-Z0-9] - do any of
> the keycode names have digits, or can you shorten the regex to [a-zA-Z]?
Several ends with digits.
>
> > -
> > -static int number_to_qcode[0x100];
> > +#include "ui/input-keymap-linux2qcode.c"
> > +#include "ui/input-keymap-qcode2qnum.c"
> > +#include "ui/input-keymap-qnum2qcode.c"
> >
> > int qemu_input_linux_to_qcode(unsigned int lnx)
> > {
> > - assert(lnx < KEY_CNT);
> > - return linux_to_qcode[lnx];
>
> The old code asserted on an out-of-range input,
>
> > + if (lnx >= qemu_input_map_linux2qcode_len) {
> > + return 0;
> > + }
> > + return qemu_input_map_linux2qcode[lnx];
>
> the new code returns 0. I guess that's okay, though, since the
> generated table uses 0 for invalid entries, and there's no implicit
> reason why out-of-range input has to assert.
Using assert() for these mappings is really dangerous and could lead to
denial of service security bugs. I had kept asserts originally but then
found I was able to trigger asserts from VNC keyboard events, or monitor
send-key command by sending out of range scancodes. IOW VNC client could
crash QEMU. Fortunately the original code was not vulnerable to that,
only my patches, but I think it is better not to take that risk at all.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 05/15] ui: use QKeyCode exclusively in InputKeyEvent
2017-08-10 19:02 ` Eric Blake
@ 2017-08-11 9:13 ` Daniel P. Berrange
0 siblings, 0 replies; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-11 9:13 UTC (permalink / raw)
To: Eric Blake; +Cc: qemu-devel, Gerd Hoffmann
On Thu, Aug 10, 2017 at 02:02:32PM -0500, Eric Blake wrote:
> On 08/10/2017 10:55 AM, Daniel P. Berrange wrote:
> > Now that keycode numbers are converted to QKeyCodes immediately
> > when creating input events, the InputKeyEvent struct can be
> > changed to only accept a QKeyCode, instead of a KeyValue.
> >
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
>
> > +++ b/qapi-schema.json
> > @@ -5747,7 +5747,7 @@
> > # Since: 2.0
> > ##
> > { 'struct' : 'InputKeyEvent',
> > - 'data' : { 'key' : 'KeyValue',
> > + 'data' : { 'key' : 'QKeyCode',
> > 'down' : 'bool' } }
>
> Isn't this going to break backwards-compatibility of 'input-send-event'?
>
> I think you have to keep the public API the same, even if you make the
> conversion as early as possible to the preferred mapping form internally.
Oh urgh, I never noticed there even was an "input-send-event" command,
only "send-key".
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 06/15] input: convert virtio-input-hid device to keycodemapdb
2017-08-10 15:55 ` [Qemu-devel] [PATCH 06/15] input: convert virtio-input-hid device to keycodemapdb Daniel P. Berrange
@ 2017-08-21 13:49 ` Gerd Hoffmann
2017-08-30 16:01 ` Daniel P. Berrange
0 siblings, 1 reply; 33+ messages in thread
From: Gerd Hoffmann @ 2017-08-21 13:49 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel
On Thu, 2017-08-10 at 16:55 +0100, Daniel P. Berrange wrote:
> - virtio_input_key_config(vinput, keymap_qcode,
> - ARRAY_SIZE(keymap_qcode));
> + virtio_input_key_config(vinput, qemu_input_map_qcode2linux,
> + qemu_input_map_qcode2linux_len);
That is a guest-visible change.
cheers,
Gerd
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
` (18 preceding siblings ...)
2017-08-10 16:12 ` no-reply
@ 2017-08-21 13:53 ` Gerd Hoffmann
19 siblings, 0 replies; 33+ messages in thread
From: Gerd Hoffmann @ 2017-08-21 13:53 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel
On Thu, 2017-08-10 at 16:55 +0100, Daniel P. Berrange wrote:
> The keycodemap project[1] provides a database mapping between
> many different keysym/keycode/scancode sets, along with a
> tool to generate mapping/lookup tables in various programming
> languages. It is already used by GTK-VNC, SPICE-GTK and
> libvirt.
>
> This series enables its use in QEMU, thus fixing a great
> many bugs/ommissions in the 15+ key mapping tables people
> have manually written for QEMU.
Looks good on a quick look. I'll have a closer look and test once I'm
done processing my vacation email backlog.
One thing for now: I think we should not require the keycodemapdb at
build time. Instead commit the generated files to git so the build
works without the submodule, then update the generated files each time
the submodule is updated (simliar to firmware blobs/submodules).
cheers,
Gerd
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 06/15] input: convert virtio-input-hid device to keycodemapdb
2017-08-21 13:49 ` Gerd Hoffmann
@ 2017-08-30 16:01 ` Daniel P. Berrange
2017-09-01 7:10 ` Gerd Hoffmann
0 siblings, 1 reply; 33+ messages in thread
From: Daniel P. Berrange @ 2017-08-30 16:01 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: qemu-devel
On Mon, Aug 21, 2017 at 03:49:05PM +0200, Gerd Hoffmann wrote:
> On Thu, 2017-08-10 at 16:55 +0100, Daniel P. Berrange wrote:
> > - virtio_input_key_config(vinput, keymap_qcode,
> > - ARRAY_SIZE(keymap_qcode));
> > + virtio_input_key_config(vinput, qemu_input_map_qcode2linux,
> > + qemu_input_map_qcode2linux_len);
>
> That is a guest-visible change.
Huh, really ?!?!?
Are you saying the guest OS sees the raw qcode values ? IIUC these are
something we never wanted to expose outside QEMU, because nothing in
QAPI is gauranteeing enum values are stable - only the string
representation is stable in QAPI.
I thought this device was sending linux keycodes to the guest, not
qcodes ????
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 06/15] input: convert virtio-input-hid device to keycodemapdb
2017-08-30 16:01 ` Daniel P. Berrange
@ 2017-09-01 7:10 ` Gerd Hoffmann
0 siblings, 0 replies; 33+ messages in thread
From: Gerd Hoffmann @ 2017-09-01 7:10 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel
On Wed, 2017-08-30 at 17:01 +0100, Daniel P. Berrange wrote:
> On Mon, Aug 21, 2017 at 03:49:05PM +0200, Gerd Hoffmann wrote:
> > On Thu, 2017-08-10 at 16:55 +0100, Daniel P. Berrange wrote:
> > > - virtio_input_key_config(vinput, keymap_qcode,
> > > - ARRAY_SIZE(keymap_qcode));
> > > + virtio_input_key_config(vinput, qemu_input_map_qcode2linux,
> > > + qemu_input_map_qcode2linux_len);
> >
> > That is a guest-visible change.
>
> Huh, really ?!?!?
>
> Are you saying the guest OS sees the raw qcode values ?
No. It'll see a bitmap of supported keys, and that will change.
I'd suggest to just drop that patch for now, and when the dust has
settled (qcode got all missing keys etc) flip it over, so we get away
with a single compat property.
cheers,
Gerd
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb
[not found] <mailman.1016.1502380547.21956.qemu-devel@nongnu.org>
@ 2017-08-12 19:41 ` Programmingkid
0 siblings, 0 replies; 33+ messages in thread
From: Programmingkid @ 2017-08-12 19:41 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel@nongnu.org qemu-devel
> The keycodemap project[1] provides a database mapping between
> many different keysym/keycode/scancode sets, along with a
> tool to generate mapping/lookup tables in various programming
> languages. It is already used by GTK-VNC, SPICE-GTK and
> libvirt.
>
> This series enables its use in QEMU, thus fixing a great
> many bugs/ommissions in the 15+ key mapping tables people
> have manually written for QEMU.
>
> The keycodemapdb code is designed to be used as a git
> sub-module, it is not an external dependancy you need
> installed before use.
>
> This series converts all the front ends and all the input
> devices which are using the new InputEvent framework. A
> handful of devices still use the legacy kbd handler
I checked out your GitHub repo's keycodemap branch and tried to build it on Mac OS 10.12. This is the error message I saw:
GEN module_block.h
make: *** No rule to make target `ui/input-keymap-atset1-to-qcode.c', needed by `Makefile'. Stop.
make: *** Waiting for unfinished jobs....
Commands used:
git clone https://github.com/berrange/qemu.git
git checkout keycodemap
./configure --target-list=ppc-softmmu,i386-softmmu
make -j 4
Note: using the make command without the "-j 4" argument still causes the same error to appear.
^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2017-09-01 7:10 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-10 15:55 [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 01/15] ui: add keycodemapdb repository as a GIT submodule Daniel P. Berrange
2017-08-10 18:23 ` Eric Blake
2017-08-11 9:07 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 02/15] ui: convert common input code to keycodemapdb Daniel P. Berrange
2017-08-10 18:59 ` Eric Blake
2017-08-11 9:12 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 03/15] ui: convert key events to QKeyCodes immediately Daniel P. Berrange
2017-08-10 19:11 ` Eric Blake
2017-08-10 15:55 ` [Qemu-devel] [PATCH 04/15] ui: don't export qemu_input_event_new_key Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 05/15] ui: use QKeyCode exclusively in InputKeyEvent Daniel P. Berrange
2017-08-10 19:02 ` Eric Blake
2017-08-11 9:13 ` Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 06/15] input: convert virtio-input-hid device to keycodemapdb Daniel P. Berrange
2017-08-21 13:49 ` Gerd Hoffmann
2017-08-30 16:01 ` Daniel P. Berrange
2017-09-01 7:10 ` Gerd Hoffmann
2017-08-10 15:55 ` [Qemu-devel] [PATCH 07/15] input: convert ps2 " Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 08/15] input: convert the adb " Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 09/15] char: convert the escc " Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 10/15] ui: convert cocoa frontend " Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 11/15] ui: convert the SDL2 " Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 12/15] ui: convert GTK and SDL1 frontends " Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 13/15] ui: remove qemu_input_qcode_to_number method Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 14/15] ui: remove qemu_input_linux_to_qcode method Daniel P. Berrange
2017-08-10 15:55 ` [Qemu-devel] [PATCH 15/15] display: convert XenInput keyboard to keycodemapdb Daniel P. Berrange
2017-08-10 16:10 ` [Qemu-devel] [PATCH 00/15] Convert over to use keycodemapdb no-reply
2017-08-10 16:59 ` Daniel P. Berrange
2017-08-10 16:11 ` no-reply
2017-08-10 16:11 ` no-reply
2017-08-10 16:12 ` no-reply
2017-08-21 13:53 ` Gerd Hoffmann
[not found] <mailman.1016.1502380547.21956.qemu-devel@nongnu.org>
2017-08-12 19:41 ` Programmingkid
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.