Re: [Qemu-devel] [PATCH v7 3/4] ui: fix alphabetical ordering of keymaps

[Philippe Mathieu-Daudé]

On 01/17/2018 01:41 PM, Daniel P. Berrange wrote:
> The qcode-to-linux keymaps was accidentally added in the wrong place
> by
> 
>   commit de80d78594b4c3767a12d8d42debcf12cbf85a5b
>   Author: Owen Smith <address@hidden>
>   Date:   Fri Nov 3 11:56:28 2017 +0000
> 
>     ui: generate qcode to linux mappings
> 
> breaking the alphabetical ordering of keymaps
> 
> Signed-off-by: Daniel P. Berrange <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  Makefile           | 2 +-
>  include/ui/input.h | 6 +++---
>  ui/input-keymap.c  | 2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index c62e96b6c7..e3f960905f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -236,10 +236,10 @@ KEYCODEMAP_FILES = \
>                ui/input-keymap-qcode-to-atset1.c \
>                ui/input-keymap-qcode-to-atset2.c \
>                ui/input-keymap-qcode-to-atset3.c \
> +              ui/input-keymap-qcode-to-linux.c \
>                ui/input-keymap-qcode-to-qnum.c \
>                ui/input-keymap-qcode-to-sun.c \
>                ui/input-keymap-qnum-to-qcode.c \
> -              ui/input-keymap-qcode-to-linux.c \
>                $(NULL)
>  
>  GENERATED_FILES += $(KEYCODEMAP_FILES)
> diff --git a/include/ui/input.h b/include/ui/input.h
> index e6c9b483b0..bf3d0d1060 100644
> --- a/include/ui/input.h
> +++ b/include/ui/input.h
> @@ -80,6 +80,9 @@ extern const guint16 qemu_input_map_qcode_to_atset2[];
>  extern const guint qemu_input_map_qcode_to_atset3_len;
>  extern const guint16 qemu_input_map_qcode_to_atset3[];
>  
> +extern const guint qemu_input_map_qcode_to_linux_len;
> +extern const guint16 qemu_input_map_qcode_to_linux[];
> +
>  extern const guint qemu_input_map_qcode_to_qnum_len;
>  extern const guint16 qemu_input_map_qcode_to_qnum[];
>  
> @@ -89,7 +92,4 @@ extern const guint16 qemu_input_map_qcode_to_sun[];
>  extern const guint qemu_input_map_qnum_to_qcode_len;
>  extern const guint16 qemu_input_map_qnum_to_qcode[];
>  
> -extern const guint qemu_input_map_qcode_to_linux_len;
> -extern const guint16 qemu_input_map_qcode_to_linux[];
> -
>  #endif /* INPUT_H */
> diff --git a/ui/input-keymap.c b/ui/input-keymap.c
> index 32cc224e39..1f60caf314 100644
> --- a/ui/input-keymap.c
> +++ b/ui/input-keymap.c
> @@ -9,10 +9,10 @@
>  #include "ui/input-keymap-qcode-to-atset1.c"
>  #include "ui/input-keymap-qcode-to-atset2.c"
>  #include "ui/input-keymap-qcode-to-atset3.c"
> +#include "ui/input-keymap-qcode-to-linux.c"
>  #include "ui/input-keymap-qcode-to-qnum.c"
>  #include "ui/input-keymap-qcode-to-sun.c"
>  #include "ui/input-keymap-qnum-to-qcode.c"
> -#include "ui/input-keymap-qcode-to-linux.c"
>  
>  int qemu_input_linux_to_qcode(unsigned int lnx)
>  {
>