qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
Subject: [Qemu-devel] [PULL 02/12] vl: rename DisplayType to LegacyDisplayType
Date: Tue, 20 Feb 2018 14:47:13 +0100	[thread overview]
Message-ID: <20180220134723.11776-3-kraxel@redhat.com> (raw)
In-Reply-To: <20180220134723.11776-1-kraxel@redhat.com>

qapi DisplayType will replace the current enum.  For the transition both
will coexist though, so rename it so we don't have a name clash.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20180202111022.19269-4-kraxel@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 vl.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vl.c b/vl.c
index c1f763f3e1..746e2c169c 100644
--- a/vl.c
+++ b/vl.c
@@ -2083,7 +2083,7 @@ static void select_vgahw(const char *p)
     }
 }
 
-typedef enum DisplayType {
+typedef enum LegacyDisplayType {
     DT_DEFAULT,
     DT_CURSES,
     DT_SDL,
@@ -2091,12 +2091,12 @@ typedef enum DisplayType {
     DT_GTK,
     DT_EGL,
     DT_NONE,
-} DisplayType;
+} LegacyDisplayType;
 
-static DisplayType select_display(const char *p)
+static LegacyDisplayType select_display(const char *p)
 {
     const char *opts;
-    DisplayType display = DT_DEFAULT;
+    LegacyDisplayType display = DT_DEFAULT;
 
     if (strstart(p, "sdl", &opts)) {
 #ifdef CONFIG_SDL
@@ -3051,7 +3051,7 @@ int main(int argc, char **argv, char **envp)
     const char *incoming = NULL;
     bool userconfig = true;
     bool nographic = false;
-    DisplayType display_type = DT_DEFAULT;
+    LegacyDisplayType display_type = DT_DEFAULT;
     int display_remote = 0;
     const char *log_mask = NULL;
     const char *log_file = NULL;
-- 
2.9.3

  parent reply	other threads:[~2018-02-20 13:47 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-20 13:47 [Qemu-devel] [PULL 00/12] Ui 20180220 patches Gerd Hoffmann
2018-02-20 13:47 ` [Qemu-devel] [PULL 01/12] vl: deprecate -no-frame Gerd Hoffmann
2018-02-20 13:47 ` Gerd Hoffmann [this message]
2018-02-20 13:47 ` [Qemu-devel] [PULL 03/12] gtk: add and use DisplayOptions + DisplayGTK Gerd Hoffmann
2018-02-20 13:47 ` [Qemu-devel] [PULL 04/12] sdl: use DisplayOptions Gerd Hoffmann
2018-02-20 13:47 ` [Qemu-devel] [PULL 05/12] vl: drop no_quit variable Gerd Hoffmann
2018-02-20 13:47 ` [Qemu-devel] [PULL 06/12] egl-headless: use DisplayOptions Gerd Hoffmann
2018-02-20 13:47 ` [Qemu-devel] [PULL 07/12] curses: " Gerd Hoffmann
2018-02-20 13:47 ` [Qemu-devel] [PULL 08/12] cocoa: " Gerd Hoffmann
2018-02-20 13:47 ` [Qemu-devel] [PULL 09/12] vl: drop full_screen variable Gerd Hoffmann
2018-02-20 13:47 ` [Qemu-devel] [PULL 10/12] vl: drop request_opengl variable Gerd Hoffmann
2018-02-20 13:47 ` [Qemu-devel] [PULL 11/12] vl: drop display_type variable Gerd Hoffmann
2018-02-20 13:47 ` [Qemu-devel] [PULL 12/12] ui: Reorder vte terminal packing to avoid gtk3 warnings Gerd Hoffmann
2018-02-20 15:38 ` [Qemu-devel] [PULL 00/12] Ui 20180220 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=20180220134723.11776-3-kraxel@redhat.com \
    --to=kraxel@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).