[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 8/9] ui: normalize the 'sysrq' key into the 'prin
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v1 8/9] ui: normalize the 'sysrq' key into the 'print' key |
Date: |
Thu, 19 Oct 2017 15:28:47 +0100 |
The 'sysrq' key was mistakenly added to QEMU to deal with incorrect handling
of the 'print' key in the ps2 device:
commit f2289cb6924afc97b2a75d21bfc9217024d11741
Author: balrog <address@hidden>
Date: Wed Jun 4 10:14:16 2008 +0000
Add sysrq to key names known by "sendkey".
Adding sysrq keycode to the table enabling running sysrq debugging in
the guest via the monitor sendkey command, like:
(qemu) sendkey alt-sysrq-t
Tested on x86-64 target and Linux guest.
Signed-off-by: Ryan Harper <address@hidden>
The ps2 device is now fixed wrt modifiers and the 'print' key. Further the
handling of the 'sysrq' key has some problems of its own, documented in the
previous commit. To cleanup this mess, we convert any use of 'sysrq' into
'print' prior to dispatching the event to device models.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
qapi/ui.json | 7 +++++++
ui/input.c | 14 ++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/qapi/ui.json b/qapi/ui.json
index e5d6610b4a..07b468f625 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -748,6 +748,13 @@
# @ac_bookmarks: since 2.10
# altgr, altgr_r: dropped in 2.10
#
+# 'sysrq' was mistakenly added to hack around the fact that
+# the ps2 driver was not generating correct scancodes sequences
+# when 'alt+print' was pressed. This flaw is now fixed and the
+# 'sysrq' key serves no further purpose. Any further use of
+# 'sysrq' will be transparently changed to 'print', so they
+# are effectively synonyms.
+#
# Since: 1.3.0
#
##
diff --git a/ui/input.c b/ui/input.c
index 4e821f8f2b..3e2d324278 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -353,6 +353,20 @@ void qemu_input_event_send(QemuConsole *src, InputEvent
*evt)
assert(!(evt->type == INPUT_EVENT_KIND_KEY &&
evt->u.key.data->key->type == KEY_VALUE_KIND_NUMBER));
+
+ /*
+ * 'sysrq' was mistakenly added to hack around the fact that
+ * the ps2 driver was not generating correct scancodes sequences
+ * when 'alt+print' was pressed. This flaw is now fixed and the
+ * 'sysrq' key serves no further purpose. We normalize it to
+ * 'print', so that downstream receivers of the event don't
+ * neeed to deal with this mistake
+ */
+ if (evt->type == INPUT_EVENT_KIND_KEY &&
+ evt->u.key.data->key->u.qcode.data == Q_KEY_CODE_SYSRQ) {
+ evt->u.key.data->key->u.qcode.data = Q_KEY_CODE_PRINT;
+ }
+
if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) {
return;
}
--
2.13.6
- Re: [Qemu-devel] [PATCH v1 2/9] ui: fix crash with sendkey and raw key numbers, (continued)
- [Qemu-devel] [PATCH v1 3/9] ui: use correct union field for key number, Daniel P. Berrange, 2017/10/19
- [Qemu-devel] [PATCH v1 1/9] input: use hex in ps2 keycode trace events, Daniel P. Berrange, 2017/10/19
- [Qemu-devel] [PATCH v1 4/9] ps2: fix scancodes sent for Alt-Print key combination (aka SysRq), Daniel P. Berrange, 2017/10/19
- [Qemu-devel] [PATCH v1 5/9] ps2: fix scancodes sent for Shift/Ctrl+Print key combination, Daniel P. Berrange, 2017/10/19
- [Qemu-devel] [PATCH v1 6/9] ps2: fix scancodess sent for Pause key in AT set 1, Daniel P. Berrange, 2017/10/19
- [Qemu-devel] [PATCH v1 7/9] ps2: fix scancodes sent for Ctrl+Pause key combination, Daniel P. Berrange, 2017/10/19
- [Qemu-devel] [PATCH v1 8/9] ui: normalize the 'sysrq' key into the 'print' key,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v1 9/9] ui: pull in latest keycodemapdb, Daniel P. Berrange, 2017/10/19