diff mbox series

[v1,3/9] ui: use correct union field for key number

Message ID 20171019142848.572-4-berrange@redhat.com
State New
Headers show
Series Various fixes for input/ps2 handling | expand

Commit Message

Daniel P. Berrangé Oct. 19, 2017, 2:28 p.m. UTC
The code converting key numbers to QKeyCode in the 'input-send-event'
command mistakenly accessed the key->u.qcode union field instead of
the key->u.number field. This is harmless because the fields use the
same size datatype in both cases, but none the less it should be fixed
to avoid confusion.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 ui/input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eric Blake Oct. 19, 2017, 3:19 p.m. UTC | #1
On 10/19/2017 09:28 AM, Daniel P. Berrange wrote:
> The code converting key numbers to QKeyCode in the 'input-send-event'
> command mistakenly accessed the key->u.qcode union field instead of
> the key->u.number field. This is harmless because the fields use the
> same size datatype in both cases, but none the less it should be fixed
> to avoid confusion.
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  ui/input.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/ui/input.c b/ui/input.c
> index 290b47354a..4e821f8f2b 100644
> --- a/ui/input.c
> +++ b/ui/input.c
> @@ -162,7 +162,7 @@ void qmp_input_send_event(bool has_device, const char *device,
>          if (evt->type == INPUT_EVENT_KIND_KEY &&
>              evt->u.key.data->key->type == KEY_VALUE_KIND_NUMBER) {
>              KeyValue *key = evt->u.key.data->key;
> -            QKeyCode code = qemu_input_key_number_to_qcode(key->u.qcode.data);
> +            QKeyCode code = qemu_input_key_number_to_qcode(key->u.number.data);
>              qemu_input_event_send_key_qcode(con, code, evt->u.key.data->down);
>          } else {
>              qemu_input_event_send(con, evt);
>
diff mbox series

Patch

diff --git a/ui/input.c b/ui/input.c
index 290b47354a..4e821f8f2b 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -162,7 +162,7 @@  void qmp_input_send_event(bool has_device, const char *device,
         if (evt->type == INPUT_EVENT_KIND_KEY &&
             evt->u.key.data->key->type == KEY_VALUE_KIND_NUMBER) {
             KeyValue *key = evt->u.key.data->key;
-            QKeyCode code = qemu_input_key_number_to_qcode(key->u.qcode.data);
+            QKeyCode code = qemu_input_key_number_to_qcode(key->u.number.data);
             qemu_input_event_send_key_qcode(con, code, evt->u.key.data->down);
         } else {
             qemu_input_event_send(con, evt);