qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Markus Armbruster <armbru@redhat.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH 04/24] vl: rename DisplayType to LegacyDisplayType
Date: Fri, 17 Nov 2017 11:30:26 +0100	[thread overview]
Message-ID: <20171117103046.15943-5-kraxel@redhat.com> (raw)
In-Reply-To: <20171117103046.15943-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>
---
 vl.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vl.c b/vl.c
index 7dab7523a6..3310ae60d3 100644
--- a/vl.c
+++ b/vl.c
@@ -2139,7 +2139,7 @@ static void select_vgahw(const char *p)
     }
 }
 
-typedef enum DisplayType {
+typedef enum LegacyDisplayType {
     DT_DEFAULT,
     DT_CURSES,
     DT_SDL,
@@ -2147,12 +2147,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
@@ -3092,7 +3092,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:[~2017-11-17 10:30 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-17 10:30 [Qemu-devel] [PATCH 00/24] RfC: rework display initialization Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 01/24] sdl: remove -no-frame support Gerd Hoffmann
2017-11-17 14:21   ` Daniel P. Berrange
2017-11-17 14:49     ` Gerd Hoffmann
2017-11-17 14:59       ` Daniel P. Berrange
2017-11-17 15:06         ` Daniel P. Berrange
2017-11-17 10:30 ` [Qemu-devel] [PATCH 02/24] sdl: remove -alt-grab and -ctrl-grab support Gerd Hoffmann
2017-11-17 14:22   ` Daniel P. Berrange
2017-11-17 14:51     ` Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 03/24] sdl: use ctrl-alt-g as grab hotkey Gerd Hoffmann
2017-11-17 10:30 ` Gerd Hoffmann [this message]
2017-11-17 10:30 ` [Qemu-devel] [PATCH 05/24] gtk: add and use DisplayOptions + DisplayGTK Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 06/24] sdl: use DisplayOptions Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 07/24] vl: drop no_quit variable Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 08/24] egl-headless: use DisplayOptions Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 09/24] curses: " Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 10/24] cocoa: " Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 11/24] vl: drop full_screen variable Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 12/24] vl: drop display_type variable Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 13/24] vl: drop request_opengl variable Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 14/24] console: add qemu display registry, add gtk Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 15/24] sdl: hook up to display registry Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 16/24] cocoa: " Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 17/24] curses: " Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 18/24] egl-headless: " Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 19/24] console: add and use qemu_display_find_default Gerd Hoffmann
2017-11-17 12:55   ` Darren Kenny
2017-11-17 13:24     ` Gerd Hoffmann
2017-11-17 14:16       ` Darren Kenny
2017-11-17 15:03         ` Gerd Hoffmann
2017-11-17 15:55           ` Darren Kenny
2017-11-17 10:30 ` [Qemu-devel] [PATCH 20/24] console: add ui module loading support Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 21/24] sdl: build as module Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 22/24] gtk: " Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 23/24] curses: " Gerd Hoffmann
2017-11-17 10:30 ` [Qemu-devel] [PATCH 24/24] build: opengl should not need X11 Gerd Hoffmann
2017-11-17 10:58 ` [Qemu-devel] [PATCH 00/24] RfC: rework display initialization no-reply

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=20171117103046.15943-5-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=armbru@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).