From 82748fbba06a49a3651f7f5688bb0ee201e76d1c Mon Sep 17 00:00:00 2001 From: Amos Kong Date: Wed, 29 Oct 2014 07:58:33 +0100 Subject: [PATCH 7/8] input: fix send-key monitor command release event ordering Message-id: <1414569514-1155-2-git-send-email-akong@redhat.com> Patchwork-id: 61989 O-Subject: [RHEL-7.1 qemu-kvm-rhev PATCH 1/2] input: fix send-key monitor command release event ordering Bugzilla: 1145028 1146801 RH-Acked-by: Markus Armbruster RH-Acked-by: Marcelo Tosatti RH-Acked-by: Gerd Hoffmann From: Gerd Hoffmann commit 2e377f1730d06deafb3e3ef6cf88792de4a6f4df changed the ordering of the release events as side effect. Some guests are not happy with that and don't recognise ctrl-alt-del any more. This patch restores the old last-pressed first-released behavior. Cc: Amos Kong Signed-off-by: Gerd Hoffmann (cherry picked from commit e37f20245080b4fa77aa312b01853dab42be85a9) Signed-off-by: Amos Kong Signed-off-by: Miroslav Rezanina --- ui/input-legacy.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ui/input-legacy.c b/ui/input-legacy.c index 3025f50..a698a34 100644 --- a/ui/input-legacy.c +++ b/ui/input-legacy.c @@ -85,6 +85,8 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time, Error **errp) { KeyValueList *p; + KeyValue **up = NULL; + int count = 0; if (!has_hold_time) { hold_time = 0; /* use default */ @@ -93,11 +95,16 @@ 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); qemu_input_event_send_key_delay(hold_time); + up = g_realloc(up, sizeof(*up) * (count+1)); + up[count] = copy_key_value(p->value); + count++; } - for (p = keys; p != NULL; p = p->next) { - qemu_input_event_send_key(NULL, copy_key_value(p->value), false); + while (count) { + count--; + qemu_input_event_send_key(NULL, up[count], false); qemu_input_event_send_key_delay(hold_time); } + g_free(up); } static void legacy_kbd_event(DeviceState *dev, QemuConsole *src, -- 1.8.3.1