[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/12] egl-headless: use DisplayOptions
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 06/12] egl-headless: use DisplayOptions |
Date: |
Tue, 20 Feb 2018 14:47:17 +0100 |
Switch egl-headless ui to use qapi DisplayOptions for configuration.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/console.h | 2 +-
ui/egl-headless.c | 2 +-
vl.c | 3 ++-
qapi/ui.json | 5 +++--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 4e4d027936..183d9f2913 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -505,6 +505,6 @@ static inline void early_gtk_display_init(DisplayOptions
*opts)
#endif
/* egl-headless.c */
-void egl_headless_init(void);
+void egl_headless_init(DisplayOptions *opts);
#endif
diff --git a/ui/egl-headless.c b/ui/egl-headless.c
index 5d50226869..38b3766548 100644
--- a/ui/egl-headless.c
+++ b/ui/egl-headless.c
@@ -154,7 +154,7 @@ static const DisplayChangeListenerOps egl_ops = {
.dpy_gl_update = egl_scanout_flush,
};
-void egl_headless_init(void)
+void egl_headless_init(DisplayOptions *opts)
{
QemuConsole *con;
egl_dpy *edpy;
diff --git a/vl.c b/vl.c
index f52bc3b879..38c18ef2e6 100644
--- a/vl.c
+++ b/vl.c
@@ -2178,6 +2178,7 @@ static LegacyDisplayType select_display(const char *p)
request_opengl = 1;
display_opengl = 1;
display = DT_EGL;
+ dpy.type = DISPLAY_TYPE_EGL_HEADLESS;
#else
error_report("egl support is disabled");
exit(1);
@@ -4726,7 +4727,7 @@ int main(int argc, char **argv, char **envp)
#ifdef CONFIG_OPENGL_DMABUF
if (display_type == DT_EGL) {
- egl_headless_init();
+ egl_headless_init(&dpy);
}
#endif
diff --git a/qapi/ui.json b/qapi/ui.json
index 2efe9675b7..43de75fa27 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1020,7 +1020,7 @@
#
##
{ 'enum' : 'DisplayType',
- 'data' : [ 'none', 'gtk', 'sdl' ] }
+ 'data' : [ 'none', 'gtk', 'sdl', 'egl-headless' ] }
##
# @DisplayOptions:
@@ -1043,4 +1043,5 @@
'discriminator' : 'type',
'data' : { 'none' : 'DisplayNoOpts',
'gtk' : 'DisplayGTK',
- 'sdl' : 'DisplayNoOpts' } }
+ 'sdl' : 'DisplayNoOpts',
+ 'egl-headless' : 'DisplayNoOpts' } }
--
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, 2018/02/20
- [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 <=
- [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