Commit 16ab0a74 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

egl-headless: switch over to new display registry 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-6-kraxel@redhat.com
parent b0766612

include/ui/console.h

+0 −3
Original line number Diff line number Diff line
@@ -456,7 +456,4 @@ int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp); 
/* input.c */

int index_from_key(const char *key, size_t key_length);



/* egl-headless.c */

void egl_headless_init(DisplayOptions *opts);



#endif

ui/egl-headless.c

+19 −1
Original line number Diff line number Diff line
@@ -164,7 +164,12 @@ static const DisplayChangeListenerOps egl_ops = { 
    .dpy_gl_update           = egl_scanout_flush,

};



void egl_headless_init(DisplayOptions *opts)

static void early_egl_headless_init(DisplayOptions *opts)

{

    display_opengl = 1;

}



static void egl_headless_init(DisplayState *ds, DisplayOptions *opts)

{

    QemuConsole *con;

    egl_dpy *edpy;
@@ -188,3 +193,16 @@ void egl_headless_init(DisplayOptions *opts) 
        register_displaychangelistener(&edpy->dcl);

    }

}



static QemuDisplay qemu_display_egl = {

    .type       = DISPLAY_TYPE_EGL_HEADLESS,

    .early_init = early_egl_headless_init,

    .init       = egl_headless_init,

};



static void register_egl(void)

{

    qemu_display_register(&qemu_display_egl);

}



type_init(register_egl);

vl.c

+0 −12
Original line number Diff line number Diff line
@@ -2160,13 +2160,7 @@ static void parse_display(const char *p) 
            exit(1);

        }

    } else if (strstart(p, "egl-headless", &opts)) {

#ifdef CONFIG_OPENGL_DMABUF

        display_opengl = 1;

        dpy.type = DISPLAY_TYPE_EGL_HEADLESS;

#else

        error_report("egl support is disabled");

        exit(1);

#endif

    } else if (strstart(p, "curses", &opts)) {

        dpy.type = DISPLAY_TYPE_CURSES;

    } else if (strstart(p, "gtk", &opts)) {
@@ -4672,12 +4666,6 @@ int main(int argc, char **argv, char **envp) 
        qemu_spice_display_init();

    }



#ifdef CONFIG_OPENGL_DMABUF

    if (dpy.type == DISPLAY_TYPE_EGL_HEADLESS) {

        egl_headless_init(&dpy);

    }

#endif



    if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) {

        exit(1);

    }