@@ -530,6 +530,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
@@ -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;
@@ -2181,6 +2181,7 @@ static LegacyDisplayType select_display(const char *p)
request_opengl = 1;
display_opengl = 1;
display = DT_EGL;
+ dpy.type = DISPLAY_TYPE_EGL_HEADLESS;
#else
fprintf(stderr, "egl support is disabled\n");
exit(1);
@@ -4737,7 +4738,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
@@ -1017,7 +1017,7 @@
#
##
{ 'enum' : 'DisplayType',
- 'data' : [ 'none', 'gtk', 'sdl' ] }
+ 'data' : [ 'none', 'gtk', 'sdl', 'egl-headless' ] }
##
# @DisplayOptions:
@@ -1040,4 +1040,5 @@
'discriminator' : 'type',
'data' : { 'none' : 'DisplayNoOpts',
'gtk' : 'DisplayGTK',
- 'sdl' : 'DisplayNoOpts' } }
+ 'sdl' : 'DisplayNoOpts',
+ 'egl-headless' : 'DisplayNoOpts' } }
Switch egl-headless ui to use qapi DisplayOptions for configuration. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- include/ui/console.h | 2 +- ui/egl-headless.c | 2 +- vl.c | 3 ++- qapi/ui.json | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-)