[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/12] console: add and use qemu_display_find_defaul
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 06/12] console: add and use qemu_display_find_default |
Date: |
Wed, 21 Feb 2018 14:15:31 +0100 |
Using the new display registry instead of #ifdefs in vl.c.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/console.h | 1 +
ui/console.c | 19 +++++++++++++++++++
vl.c | 15 +++++----------
3 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 1832c7eccf..a0d3330056 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -438,6 +438,7 @@ struct QemuDisplay {
};
void qemu_display_register(QemuDisplay *ui);
+bool qemu_display_find_default(DisplayOptions *opts);
void qemu_display_early_init(DisplayOptions *opts);
void qemu_display_init(DisplayState *ds, DisplayOptions *opts);
diff --git a/ui/console.c b/ui/console.c
index 8e55a05108..5a63e9dfa2 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2178,6 +2178,25 @@ void qemu_display_register(QemuDisplay *ui)
dpys[ui->type] = ui;
}
+bool qemu_display_find_default(DisplayOptions *opts)
+{
+ static DisplayType prio[] = {
+ DISPLAY_TYPE_GTK,
+ DISPLAY_TYPE_SDL,
+ DISPLAY_TYPE_COCOA
+ };
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(prio); i++) {
+ if (dpys[prio[i]] == NULL) {
+ continue;
+ }
+ opts->type = prio[i];
+ return true;
+ }
+ return false;
+}
+
void qemu_display_early_init(DisplayOptions *opts)
{
assert(opts->type < DISPLAY_TYPE__MAX);
diff --git a/vl.c b/vl.c
index 47c953f8dc..59e56593f8 100644
--- a/vl.c
+++ b/vl.c
@@ -4285,17 +4285,12 @@ int main(int argc, char **argv, char **envp)
}
#endif
if (dpy.type == DISPLAY_TYPE_DEFAULT && !display_remote) {
-#if defined(CONFIG_GTK)
- dpy.type = DISPLAY_TYPE_GTK;
-#elif defined(CONFIG_SDL)
- dpy.type = DISPLAY_TYPE_SDL;
-#elif defined(CONFIG_COCOA)
- dpy.type = DISPLAY_TYPE_COCOA;
-#elif defined(CONFIG_VNC)
- vnc_parse("localhost:0,to=99,id=default", &error_abort);
-#else
- dpy.type = DISPLAY_TYPE_NONE;
+ if (!qemu_display_find_default(&dpy)) {
+ dpy.type = DISPLAY_TYPE_NONE;
+#if defined(CONFIG_VNC)
+ vnc_parse("localhost:0,to=99,id=default", &error_abort);
#endif
+ }
}
if (dpy.type == DISPLAY_TYPE_DEFAULT) {
dpy.type = DISPLAY_TYPE_NONE;
--
2.9.3
- [Qemu-devel] [PATCH 00/12] ui: build sdl, gtk and curses as modules, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 08/12] configure: add X11 vars to config-host.mak, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 12/12] curses: build as ui module, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 06/12] console: add and use qemu_display_find_default,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 09/12] configure: opengl doesn't depend on x11, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 02/12] sdl: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 04/12] curses: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 03/12] cocoa: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 01/12] console: add qemu display registry, add gtk, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 11/12] gtk: build as ui module, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 05/12] egl-headless: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 07/12] console: add ui module loading support, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 10/12] sdl: build as ui module, Gerd Hoffmann, 2018/02/21