input: fix send-key monitor command release event ordering

commit 2e377f1730 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 <akong@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2014-09-26 10:02:16 +02:00
parent 29429c7244
commit e37f202450

View File

@ -85,6 +85,8 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time,
Error **errp) Error **errp)
{ {
KeyValueList *p; KeyValueList *p;
KeyValue **up = NULL;
int count = 0;
if (!has_hold_time) { if (!has_hold_time) {
hold_time = 0; /* use default */ 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) { 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(NULL, copy_key_value(p->value), true);
qemu_input_event_send_key_delay(hold_time); 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) { while (count) {
qemu_input_event_send_key(NULL, copy_key_value(p->value), false); count--;
qemu_input_event_send_key(NULL, up[count], false);
qemu_input_event_send_key_delay(hold_time); qemu_input_event_send_key_delay(hold_time);
} }
g_free(up);
} }
static void legacy_kbd_event(DeviceState *dev, QemuConsole *src, static void legacy_kbd_event(DeviceState *dev, QemuConsole *src,