qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [Qemu-devel] [PULL 7/8] keymaps: drop support for include files
Date: Thu, 10 Jan 2019 09:47:51 +0100	[thread overview]
Message-ID: <20190110084752.30510-8-kraxel@redhat.com> (raw)
In-Reply-To: <20190110084752.30510-1-kraxel@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-id: 20181116104319.10329-5-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:[~2019-01-10  8:51 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-10  8:47 [Qemu-devel] [PULL 0/8] Ui 20190110 patches Gerd Hoffmann
2019-01-10  8:47 ` [Qemu-devel] [PULL 1/8] egl-headless: add egl_create_context Gerd Hoffmann
2019-01-10  8:47 ` [Qemu-devel] [PULL 2/8] configure: bump spice-server required version to 0.12.5 Gerd Hoffmann
2019-01-10  8:47 ` [Qemu-devel] [PULL 3/8] ui/console: Remove qemu_create_display_surface_guestmem() Gerd Hoffmann
2019-01-10  8:47 ` [Qemu-devel] [PULL 4/8] keymaps: remove modifiers include Gerd Hoffmann
2019-01-10  8:47 ` [Qemu-devel] [PULL 5/8] keymaps: drop nl-be map Gerd Hoffmann
2019-01-10  8:47 ` [Qemu-devel] [PULL 6/8] keymaps: remove common include Gerd Hoffmann
2019-01-10  8:47 ` Gerd Hoffmann [this message]
2019-01-10  8:47 ` [Qemu-devel] [PULL 8/8] spice: Remove unused include Gerd Hoffmann
2019-01-11 14:10   ` Philippe Mathieu-Daudé
2019-01-10 17:49 ` [Qemu-devel] [PULL 0/8] Ui 20190110 patches Peter Maydell

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=20190110084752.30510-8-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.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).