summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGerd Hoffmann2018-11-16 11:43:19 +0100
committerGerd Hoffmann2019-01-10 08:55:31 +0100
commit2a7bece653913a962a12672eb43aa796aea5ea23 (patch)
tree619fa5dd25877b8ad736aead2158ef6f9889c831 /ui
parentkeymaps: remove common include (diff)
downloadqemu-2a7bece653913a962a12672eb43aa796aea5ea23.tar.gz
qemu-2a7bece653913a962a12672eb43aa796aea5ea23.tar.xz
qemu-2a7bece653913a962a12672eb43aa796aea5ea23.zip
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
Diffstat (limited to 'ui')
-rw-r--r--ui/keymaps.c7
1 files 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 &&