qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <laurent@vivier.eu>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Michael Tokarev <mjt@tls.msk.ru>,
	qemu-trivial@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 06/10] ui: switch trivial displays to qapi parser
Date: Tue, 15 May 2018 11:18:57 +0200	[thread overview]
Message-ID: <20180515091901.27774-7-kraxel@redhat.com> (raw)
In-Reply-To: <20180515091901.27774-1-kraxel@redhat.com>

Drop the option-less display types (egl-headless, curses, none) from
parse_display(), so they'll be handled by parse_display_qapi().

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20180507095539.19584-3-kraxel@redhat.com
---
 vl.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/vl.c b/vl.c
index c56f7f8046..6b8f946d58 100644
--- a/vl.c
+++ b/vl.c
@@ -2185,10 +2185,6 @@ static void parse_display(const char *p)
             error_report("VNC requires a display argument vnc=<display>");
             exit(1);
         }
-    } else if (strstart(p, "egl-headless", &opts)) {
-        dpy.type = DISPLAY_TYPE_EGL_HEADLESS;
-    } else if (strstart(p, "curses", &opts)) {
-        dpy.type = DISPLAY_TYPE_CURSES;
     } else if (strstart(p, "gtk", &opts)) {
         dpy.type = DISPLAY_TYPE_GTK;
         while (*opts) {
@@ -2221,8 +2217,6 @@ static void parse_display(const char *p)
             }
             opts = nextopt;
         }
-    } else if (strstart(p, "none", &opts)) {
-        dpy.type = DISPLAY_TYPE_NONE;
     } else {
         parse_display_qapi(p);
     }
-- 
2.9.3

  parent reply	other threads:[~2018-05-15  9:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-15  9:18 [Qemu-devel] [PULL 00/10] Ui 20180515 patches Gerd Hoffmann
2018-05-15  9:18 ` [Qemu-devel] [PULL 01/10] sdl2: move opts assignment into loop Gerd Hoffmann
2018-05-15  9:18 ` [Qemu-devel] [PULL 02/10] gtk: make it possible to hide the menu bar Gerd Hoffmann
2018-05-15  9:18 ` [Qemu-devel] [PULL 03/10] ui/gtk: Only try to initialize EGL/X11 if GtkGlArea failed Gerd Hoffmann
2018-05-15  9:18 ` [Qemu-devel] [PULL 04/10] vnc: add magic cookie to VncState Gerd Hoffmann
2018-05-15  9:18 ` [Qemu-devel] [PULL 05/10] ui: add qapi parser for -display Gerd Hoffmann
2018-05-15  9:18 ` Gerd Hoffmann [this message]
2018-05-15  9:18 ` [Qemu-devel] [PULL 07/10] ui: switch gtk display to qapi parser Gerd Hoffmann
2018-05-15  9:18 ` [Qemu-devel] [PULL 08/10] ui: document non-qapi parser cases Gerd Hoffmann
2018-05-15  9:19 ` [Qemu-devel] [PULL 09/10] console: use linked list for QemuConsoles Gerd Hoffmann
2018-05-15  9:19 ` [Qemu-devel] [PULL 10/10] gtk: disable the F10 menubar key Gerd Hoffmann
2018-05-15 11:49 ` [Qemu-devel] [PULL 00/10] Ui 20180515 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=20180515091901.27774-7-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=laurent@vivier.eu \
    --cc=mjt@tls.msk.ru \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@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).