qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Li Qiang <liq3ea@gmail.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH v2 4/4] keymaps: drop support for include files
Date: Fri, 16 Nov 2018 11:43:19 +0100	[thread overview]
Message-ID: <20181116104319.10329-5-kraxel@redhat.com> (raw)
In-Reply-To: <20181116104319.10329-1-kraxel@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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

  parent reply	other threads:[~2018-11-16 10:43 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-16 10:43 [Qemu-devel] [PATCH v2 0/4] keymaps: drop support for include files Gerd Hoffmann
2018-11-16 10:43 ` [Qemu-devel] [PATCH v2 1/4] keymaps: remove modifiers include Gerd Hoffmann
2018-11-16 10:43 ` [Qemu-devel] [PATCH v2 2/4] keymaps: drop nl-be map Gerd Hoffmann
2018-11-16 10:43 ` [Qemu-devel] [PATCH v2 3/4] keymaps: remove common include Gerd Hoffmann
2018-11-16 10:43 ` Gerd Hoffmann [this message]
2018-11-16 10:46   ` [Qemu-devel] [PATCH v2 4/4] keymaps: drop support for include files Li Qiang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181116104319.10329-5-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=liq3ea@gmail.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).