From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 16 Nov 2018 10:43:19 +0000 (+0100)
Subject: keymaps: drop support for include files
X-Git-Tag: v4.0.0-rc0~179^2~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2a7bece653913a962a12672eb43aa796aea5ea23;p=qemu-xen-unstable.git

keymaps: drop support for include files

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-id: 20181116104319.10329-5-kraxel@redhat.com
---

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