[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/12] vl: rename DisplayType to LegacyDisplayTyp
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 03/12] vl: rename DisplayType to LegacyDisplayType |
Date: |
Mon, 29 Jan 2018 17:23:59 +0100 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 00/12] rework display initialization, part one, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PATCH v2 03/12] vl: rename DisplayType to LegacyDisplayType,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 12/12] vl: drop request_opengl variable, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PATCH v2 05/12] sdl: use DisplayOptions, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PATCH v2 09/12] cocoa: use DisplayOptions, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PATCH v2 10/12] vl: drop full_screen variable, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PATCH v2 11/12] vl: drop display_type variable, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PATCH v2 07/12] egl-headless: use DisplayOptions, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PATCH v2 01/12] vl: deprecate -no-frame, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PATCH v2 06/12] vl: drop no_quit variable, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PATCH v2 04/12] gtk: add and use DisplayOptions + DisplayGTK, Gerd Hoffmann, 2018/01/29