[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/12] sdl: switch over to new display registry
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 02/12] sdl: switch over to new display registry |
Date: |
Tue, 27 Feb 2018 09:07:14 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
include/ui/console.h | 19 -------------------
ui/sdl.c | 24 +++++++++++++-----------
ui/sdl2.c | 17 +++++++++++++++--
vl.c | 15 +--------------
4 files changed, 29 insertions(+), 46 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 817f9b9bcc..cb86e6a0dd 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -444,25 +444,6 @@ void qemu_display_register(QemuDisplay *ui);
void qemu_display_early_init(DisplayOptions *opts);
void qemu_display_init(DisplayState *ds, DisplayOptions *opts);
-/* sdl.c */
-#ifdef CONFIG_SDL
-void sdl_display_early_init(DisplayOptions *opts);
-void sdl_display_init(DisplayState *ds, DisplayOptions *opts);
-#else
-static inline void sdl_display_early_init(DisplayOptions *opts)
-{
- /* This must never be called if CONFIG_SDL is disabled */
- error_report("SDL support is disabled");
- abort();
-}
-static inline void sdl_display_init(DisplayState *ds, DisplayOptions *opts)
-{
- /* This must never be called if CONFIG_SDL is disabled */
- error_report("SDL support is disabled");
- abort();
-}
-#endif
-
/* cocoa.m */
#ifdef CONFIG_COCOA
void cocoa_display_init(DisplayState *ds, DisplayOptions *opts);
diff --git a/ui/sdl.c b/ui/sdl.c
index c4ae7ab05d..a5fd503c25 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -901,17 +901,7 @@ static const DisplayChangeListenerOps dcl_ops = {
.dpy_cursor_define = sdl_mouse_define,
};
-void sdl_display_early_init(DisplayOptions *opts)
-{
- if (opts->has_gl && opts->gl) {
- fprintf(stderr,
- "SDL1 display code has no opengl support.\n"
- "Please recompile qemu with SDL2, using\n"
- "./configure --enable-sdl --with-sdlabi=2.0\n");
- }
-}
-
-void sdl_display_init(DisplayState *ds, DisplayOptions *o)
+static void sdl1_display_init(DisplayState *ds, DisplayOptions *o)
{
int flags;
uint8_t data = 0;
@@ -1023,3 +1013,15 @@ void sdl_display_init(DisplayState *ds, DisplayOptions
*o)
atexit(sdl_cleanup);
}
+
+static QemuDisplay qemu_display_sdl1 = {
+ .type = DISPLAY_TYPE_SDL,
+ .init = sdl1_display_init,
+};
+
+static void register_sdl1(void)
+{
+ qemu_display_register(&qemu_display_sdl1);
+}
+
+type_init(register_sdl1);
diff --git a/ui/sdl2.c b/ui/sdl2.c
index b5a0fa1d13..83b917fa37 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -751,7 +751,7 @@ static const DisplayChangeListenerOps dcl_gl_ops = {
};
#endif
-void sdl_display_early_init(DisplayOptions *o)
+static void sdl2_display_early_init(DisplayOptions *o)
{
assert(o->type == DISPLAY_TYPE_SDL);
if (o->has_gl && o->gl) {
@@ -761,7 +761,7 @@ void sdl_display_early_init(DisplayOptions *o)
}
}
-void sdl_display_init(DisplayState *ds, DisplayOptions *o)
+static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
{
int flags;
uint8_t data = 0;
@@ -861,3 +861,16 @@ void sdl_display_init(DisplayState *ds, DisplayOptions *o)
atexit(sdl_cleanup);
}
+
+static QemuDisplay qemu_display_sdl2 = {
+ .type = DISPLAY_TYPE_SDL,
+ .early_init = sdl2_display_early_init,
+ .init = sdl2_display_init,
+};
+
+static void register_sdl1(void)
+{
+ qemu_display_register(&qemu_display_sdl2);
+}
+
+type_init(register_sdl1);
diff --git a/vl.c b/vl.c
index 70458ba708..45900ba7e6 100644
--- a/vl.c
+++ b/vl.c
@@ -2085,7 +2085,6 @@ static void parse_display(const char *p)
const char *opts;
if (strstart(p, "sdl", &opts)) {
-#ifdef CONFIG_SDL
dpy.type = DISPLAY_TYPE_SDL;
while (*opts) {
const char *nextopt;
@@ -2146,10 +2145,6 @@ static void parse_display(const char *p)
}
opts = nextopt;
}
-#else
- error_report("SDL support is disabled");
- exit(1);
-#endif
} else if (strstart(p, "vnc", &opts)) {
if (*opts == '=') {
vnc_parse(opts + 1, &error_fatal);
@@ -4327,12 +4322,7 @@ int main(int argc, char **argv, char **envp)
"ignoring option");
}
- if (dpy.type == DISPLAY_TYPE_SDL) {
- sdl_display_early_init(&dpy);
- } else {
- qemu_display_early_init(&dpy);
- }
-
+ qemu_display_early_init(&dpy);
qemu_console_early_init();
if (dpy.has_gl && dpy.gl && display_opengl == 0) {
@@ -4664,9 +4654,6 @@ int main(int argc, char **argv, char **envp)
case DISPLAY_TYPE_CURSES:
curses_display_init(ds, &dpy);
break;
- case DISPLAY_TYPE_SDL:
- sdl_display_init(ds, &dpy);
- break;
case DISPLAY_TYPE_COCOA:
cocoa_display_init(ds, &dpy);
break;
--
2.9.3
- [Qemu-devel] [PULL 00/12] Ui 20180227 patches, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 03/12] cocoa: switch over to new display registry, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 09/12] configure: opengl doesn't depend on x11, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 08/12] configure: add X11 vars to config-host.mak, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 02/12] sdl: switch over to new display registry,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 10/12] sdl: build as ui module, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 11/12] gtk: build as ui module, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 06/12] console: add and use qemu_display_find_default, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 04/12] curses: switch over to new display registry, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 07/12] console: add ui module loading support, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 01/12] console: add qemu display registry, add gtk, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 12/12] curses: build as ui module, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 05/12] egl-headless: switch over to new display registry, Gerd Hoffmann, 2018/02/27
- Re: [Qemu-devel] [PULL 00/12] Ui 20180227 patches, Peter Maydell, 2018/02/27