[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/24] vl: rename DisplayType to LegacyDisplayType
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 04/24] vl: rename DisplayType to LegacyDisplayType |
Date: |
Fri, 17 Nov 2017 11:30:26 +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 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
- [Qemu-devel] [PATCH 00/24] RfC: rework display initialization, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 08/24] egl-headless: use DisplayOptions, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 11/24] vl: drop full_screen variable, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 04/24] vl: rename DisplayType to LegacyDisplayType,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 13/24] vl: drop request_opengl variable, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 02/24] sdl: remove -alt-grab and -ctrl-grab support, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 03/24] sdl: use ctrl-alt-g as grab hotkey, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 09/24] curses: use DisplayOptions, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 21/24] sdl: build as module, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 19/24] console: add and use qemu_display_find_default, Gerd Hoffmann, 2017/11/17