[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.7 v3 04/12] sdl: Initialization stubs
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH for-2.7 v3 04/12] sdl: Initialization stubs |
Date: |
Tue, 19 Apr 2016 16:55:20 -0300 |
This reduces the number of CONFIG_SDL #ifdefs in vl.c.
Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes v1 -> v2:
* Move stub file to stubs/ui/
Changes v2 -> v3:
* Move stubs to header file
---
include/ui/console.h | 16 ++++++++++++++++
vl.c | 6 ++----
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index f5fa9cb..f3e749d 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -422,8 +422,24 @@ void surface_gl_setup_viewport(ConsoleGLState *gls,
#endif
/* sdl.c */
+#ifdef CONFIG_SDL
void sdl_display_early_init(int opengl);
void sdl_display_init(DisplayState *ds, int full_screen, int no_frame);
+#else
+static inline void sdl_display_early_init(int opengl)
+{
+ /* 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, int full_screen,
+ int no_frame)
+{
+ /* This must never be called if CONFIG_SDL is disabled */
+ error_report("SDL support is disabled");
+ abort();
+}
+#endif
/* cocoa.m */
void cocoa_display_init(DisplayState *ds, int full_screen);
diff --git a/vl.c b/vl.c
index 6e2336e..51403c1 100644
--- a/vl.c
+++ b/vl.c
@@ -4249,11 +4249,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");
@@ -4543,11 +4542,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
- [Qemu-devel] [PATCH for-2.7 v3 00/12] vl: graphics stubs + #ifdef cleanup + DT_NOGRAPHIC cleanup, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 03/12] curses: curses_display_init() stub, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 04/12] sdl: Initialization stubs,
Eduardo Habkost <=
- [Qemu-devel] [PATCH for-2.7 v3 01/12] vl: Add DT_COCOA DisplayType value, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 05/12] cocoa: cocoa_display_init() stub, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 02/12] vnc: Initialization stubs, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 07/12] spice: Initialization stubs on qemu-spice.h, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 08/12] milkymist: Move DT_NOGRAPHIC check outside milkymist_tmu2_create(), Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 10/12] vl: Make display_type a local variable, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 06/12] gtk: Initialization stubs, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 09/12] vl: Replace DT_NOGRAPHIC with machine option, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 12/12] vl: Make display_remote a local variable, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 11/12] vl: Move DisplayType typedef to vl.c, Eduardo Habkost, 2016/04/19