[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/12] vl: rename DisplayType to LegacyDisplayType
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 02/12] vl: rename DisplayType to LegacyDisplayType |
Date: |
Tue, 20 Feb 2018 14:47:13 +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>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
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 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
- [Qemu-devel] [PULL 00/12] Ui 20180220 patches, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 05/12] vl: drop no_quit variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 08/12] cocoa: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 09/12] vl: drop full_screen variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 02/12] vl: rename DisplayType to LegacyDisplayType,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 12/12] ui: Reorder vte terminal packing to avoid gtk3 warnings, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 03/12] gtk: add and use DisplayOptions + DisplayGTK, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 07/12] curses: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 11/12] vl: drop display_type variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 06/12] egl-headless: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 10/12] vl: drop request_opengl variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 01/12] vl: deprecate -no-frame, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 04/12] sdl: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- Re: [Qemu-devel] [PULL 00/12] Ui 20180220 patches, Peter Maydell, 2018/02/20