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 v3 03/12] vl: rename DisplayType to LegacyDisplayType
Date: Fri, 2 Feb 2018 12:10:13 +0100 [thread overview]
Message-ID: <20180202111022.19269-4-kraxel@redhat.com> (raw)
In-Reply-To: <20180202111022.19269-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 fa19a61500..a2478412c7 100644
--- a/vl.c
+++ b/vl.c
@@ -2082,7 +2082,7 @@ static void select_vgahw(const char *p)
}
}
-typedef enum DisplayType {
+typedef enum LegacyDisplayType {
DT_DEFAULT,
DT_CURSES,
DT_SDL,
@@ -2090,12 +2090,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
@@ -3058,7 +3058,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
next prev parent reply other threads:[~2018-02-02 14:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-02 11:10 [Qemu-devel] [PATCH v3 00/12] rework display initialization, part one Gerd Hoffmann
2018-02-02 11:10 ` [Qemu-devel] [PATCH v3 01/12] vl: deprecate -no-frame Gerd Hoffmann
2018-02-02 11:10 ` [Qemu-devel] [PATCH v3 02/12] vl: deprecate -alt-grab and -ctrl-grab Gerd Hoffmann
2018-02-02 15:12 ` Eric Blake
2018-02-05 8:46 ` Gerd Hoffmann
2018-02-02 11:10 ` Gerd Hoffmann [this message]
2018-02-02 15:22 ` [Qemu-devel] [PATCH v3 03/12] vl: rename DisplayType to LegacyDisplayType Eric Blake
2018-02-02 11:10 ` [Qemu-devel] [PATCH v3 04/12] gtk: add and use DisplayOptions + DisplayGTK Gerd Hoffmann
2018-02-02 15:29 ` Eric Blake
2018-02-02 11:10 ` [Qemu-devel] [PATCH v3 05/12] sdl: use DisplayOptions Gerd Hoffmann
2018-02-02 15:31 ` Eric Blake
2018-02-02 11:10 ` [Qemu-devel] [PATCH v3 06/12] vl: drop no_quit variable Gerd Hoffmann
2018-02-02 15:35 ` Eric Blake
2018-02-05 9:56 ` Gerd Hoffmann
2018-02-02 11:10 ` [Qemu-devel] [PATCH v3 07/12] egl-headless: use DisplayOptions Gerd Hoffmann
2018-02-02 15:36 ` Eric Blake
2018-02-02 11:10 ` [Qemu-devel] [PATCH v3 08/12] curses: " Gerd Hoffmann
2018-02-02 15:38 ` Eric Blake
2018-02-02 11:10 ` [Qemu-devel] [PATCH v3 09/12] cocoa: " Gerd Hoffmann
2018-02-02 16:04 ` Eric Blake
2018-02-02 11:10 ` [Qemu-devel] [PATCH v3 10/12] vl: drop full_screen variable Gerd Hoffmann
2018-02-02 16:05 ` Eric Blake
2018-02-02 11:10 ` [Qemu-devel] [PATCH v3 11/12] vl: drop request_opengl variable Gerd Hoffmann
2018-02-02 16:06 ` Eric Blake
2018-02-02 11:10 ` [Qemu-devel] [PATCH v3 12/12] vl: drop display_type variable Gerd Hoffmann
2018-02-02 16:09 ` Eric Blake
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=20180202111022.19269-4-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).