qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrange" <berrange@redhat.com>,
	Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 2/9] ui: fix crash with sendkey and raw key numbers
Date: Mon, 23 Oct 2017 11:19:40 +0200	[thread overview]
Message-ID: <20171023091947.20771-3-kraxel@redhat.com> (raw)
In-Reply-To: <20171023091947.20771-1-kraxel@redhat.com>

From: "Daniel P. Berrange" <berrange@redhat.com>

Previously we enforced that all key events are using QKeyCodes
at time they are sent:

  commit af07e5ff02ae6d4258fc5331007811d0b1c4d35a
  Author: Daniel P. Berrange <berrange@redhat.com>
  Date:   Fri Sep 29 11:12:00 2017 +0100

    ui: convert key events to QKeyCodes immediately

This commit forget to fix the code for the legacy 'sendkey'
command which still accepts key numbers from the user, which
then need converting to QKeyCodes

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20171019142848.572-3-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/input-legacy.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index 6bc3525499..c75aba1549 100644
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -76,6 +76,11 @@ static KeyValue *copy_key_value(KeyValue *src)
 {
     KeyValue *dst = g_new(KeyValue, 1);
     memcpy(dst, src, sizeof(*src));
+    if (dst->type == KEY_VALUE_KIND_NUMBER) {
+        QKeyCode code = qemu_input_key_number_to_qcode(dst->u.number.data);
+        dst->type = KEY_VALUE_KIND_QCODE;
+        dst->u.qcode.data = code;
+    }
     return dst;
 }
 
-- 
2.9.3

  parent reply	other threads:[~2017-10-23  9:19 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-23  9:19 [Qemu-devel] [PULL 0/9] Input 20171023 patches Gerd Hoffmann
2017-10-23  9:19 ` [Qemu-devel] [PULL 1/9] input: use hex in ps2 keycode trace events Gerd Hoffmann
2017-10-23  9:19 ` Gerd Hoffmann [this message]
2017-10-23  9:19 ` [Qemu-devel] [PULL 3/9] ui: use correct union field for key number Gerd Hoffmann
2017-10-23  9:19 ` [Qemu-devel] [PULL 4/9] ps2: fix scancodes sent for Alt-Print key combination (aka SysRq) Gerd Hoffmann
2017-10-27  7:29   ` Daniel P. Berrange
2017-11-01  7:58     ` Gerd Hoffmann
2017-11-01 10:00       ` Daniel P. Berrange
2017-10-23  9:19 ` [Qemu-devel] [PULL 5/9] ps2: fix scancodes sent for Shift/Ctrl+Print key combination Gerd Hoffmann
2017-10-23  9:19 ` [Qemu-devel] [PULL 6/9] ps2: fix scancodess sent for Pause key in AT set 1 Gerd Hoffmann
2017-10-23  9:19 ` [Qemu-devel] [PULL 7/9] ps2: fix scancodes sent for Ctrl+Pause key combination Gerd Hoffmann
2017-10-23  9:19 ` [Qemu-devel] [PULL 8/9] ui: normalize the 'sysrq' key into the 'print' key Gerd Hoffmann
2017-10-23  9:19 ` [Qemu-devel] [PULL 9/9] ui: pull in latest keycodemapdb Gerd Hoffmann
2017-10-25 14:23 ` [Qemu-devel] [PULL 0/9] Input 20171023 patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171023091947.20771-3-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=berrange@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).