[Qemu-devel] [PATCH v2 4/7] stubs: SDL initialization stubs

[Eduardo Habkost <ehabkost@redhat.com>]

This reduces the number of CONFIG_SDL #ifdefs in vl.c.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Changes v1 -> v2:
* Move stub file to stubs/ui/
---
 stubs/ui/Makefile.objs |  1 +
 stubs/ui/sdl.c         | 17 +++++++++++++++++
 vl.c                   |  6 ++----
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 stubs/ui/sdl.c

diff --git a/stubs/ui/Makefile.objs b/stubs/ui/Makefile.objs
index 2f63c58..2e4c924 100644
--- a/stubs/ui/Makefile.objs
+++ b/stubs/ui/Makefile.objs
@@ -1,2 +1,3 @@
 stub-obj-y += vnc.o
 stub-obj-y += curses.o
+stub-obj-y += sdl.o
diff --git a/stubs/ui/sdl.c b/stubs/ui/sdl.c
new file mode 100644
index 0000000..f5ab668
--- /dev/null
+++ b/stubs/ui/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