[Qemu-devel] [PATCH] input: fix send-key monitor command release event ordering

[Qemu-devel] [PATCH] input: fix send-key monitor command release event ordering

[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 <akong@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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

Re: [Qemu-devel] [PATCH] input: fix send-key monitor command release event ordering

[Amos Kong]

On Fri, Sep 26, 2014 at 10:08:50AM +0200, Gerd Hoffmann wrote:
> 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>


Acked-by: Amos Kong <akong@redhat.com>
Tested-by: Amos Kong <akong@redhat.com>

I will rebase my second patch [1] on your patch.


[1] [Qemu-devel] [PATCH] ui/input: fix event emitting of repeated combined keys

> ---
>  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
> 

-- 
			Amos.