Re: [Qemu-devel] [PATCH v2 4/4] keymaps: drop support for include files

[Li Qiang]

Gerd Hoffmann <address@hidden> 于2018年11月16日周五 下午6:43写道：

> Signed-off-by: Gerd Hoffmann <address@hidden>
>

Reviewed-by: Li Qiang <address@hidden>


> ---
>  ui/keymaps.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/ui/keymaps.c b/ui/keymaps.c
> index 085889b555..6e44f738ed 100644
> --- a/ui/keymaps.c
> +++ b/ui/keymaps.c
> @@ -115,10 +115,9 @@ static int parse_keyboard_layout(kbd_layout_t *k,
>              continue;
>          }
>          if (!strncmp(line, "include ", 8)) {
> -            if (parse_keyboard_layout(k, table, line + 8, errp) < 0) {
> -                ret = -1;
> -                goto out;
> -            }
> +            error_setg(errp, "keymap include files are not supported any
> more");
> +            ret = -1;
> +            goto out;
>          } else {
>              int offset = 0;
>              while (line[offset] != 0 &&
> --
> 2.9.3
>
>