This reduces the number of CONFIG_SDL #ifdefs in vl.c. Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- stubs/Makefile.objs | 1 + stubs/sdl.c | 17 +++++++++++++++++ vl.c | 6 ++---- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 stubs/sdl.c
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index df86bc6..3a6cd37 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -39,3 +39,4 @@ stub-obj-y += target-monitor-defs.o stub-obj-y += vhost.o stub-obj-y += vnc.o stub-obj-y += curses.o +stub-obj-y += sdl.o diff --git a/stubs/sdl.c b/stubs/sdl.c new file mode 100644 index 0000000..f5ab668 --- /dev/null +++ b/stubs/sdl.c @@ -0,0 +1,17 @@ +#include "qemu-common.h" +#include "ui/console.h" +#include "qemu/error-report.h" + +void sdl_display_early_init(int opengl) +{ + /* This must never be called if CONFIG_SDL is disabled */ + error_report("SDL support is disabled"); + abort(); +} + +void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) +{ + /* This must never be called if CONFIG_SDL is disabled */ + error_report("SDL support is disabled"); + abort(); +} diff --git a/vl.c b/vl.c index 3ca1c11..5292648 100644 --- a/vl.c +++ b/vl.c @@ -4261,11 +4261,10 @@ int main(int argc, char **argv, char **envp) early_gtk_display_init(request_opengl); } #endif -#if defined(CONFIG_SDL) if (display_type == DT_SDL) { sdl_display_early_init(request_opengl); } -#endif + if (request_opengl == 1 && display_opengl == 0) { #if defined(CONFIG_OPENGL) error_report("OpenGL is not supported by the display"); @@ -4571,11 +4570,10 @@ int main(int argc, char **argv, char **envp) case DT_CURSES: curses_display_init(ds, full_screen); break; -#if defined(CONFIG_SDL) case DT_SDL: sdl_display_init(ds, full_screen, no_frame); break; -#elif defined(CONFIG_COCOA) +#if defined(CONFIG_COCOA) case DT_COCOA: cocoa_display_init(ds, full_screen); break; -- 2.1.0