浏览代码

input: fix send-key monitor command release event ordering

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 <akong@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Gerd Hoffmann 11 年之前
父节点
当前提交
e37f202450
共有 1 个文件被更改,包括 9 次插入2 次删除
  1. 9 2
      ui/input-legacy.c

+ 9 - 2
ui/input-legacy.c

@@ -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) {
-        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);
         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,