[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/21] sdl: Initialization stubs
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 08/21] sdl: Initialization stubs |
Date: |
Fri, 20 May 2016 17:28:28 -0300 |
This reduces the number of CONFIG_SDL #ifdefs in vl.c.
Signed-off-by: Eduardo Habkost <address@hidden>
---
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 c852d10..d5df442 100644
--- a/vl.c
+++ b/vl.c
@@ -4251,11 +4251,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.5.5
- [Qemu-devel] [PULL 00/21] Machine Core queue, 2016-05-20, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 19/21] vl: Use &error_fatal when parsing VNC options, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 07/21] curses: curses_display_init() stub, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 09/21] cocoa: cocoa_display_init() stub, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 08/21] sdl: Initialization stubs,
Eduardo Habkost <=
- [Qemu-devel] [PULL 18/21] machine: add properties to compat_props incrementaly, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 21/21] Use &error_fatal when initializing crypto on qemu-{img, io, nbd}, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 02/21] vl: Use exit(1) when requested VGA interface is unavailable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 01/21] pc-dimm: correct comment of MemoryHotplugState, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 16/21] vl: Make display_remote a local variable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 03/21] vl: Table-based select_vgahw(), Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 04/21] vl: Replace *_vga_available() functions with class_names field, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 12/21] milkymist: Move DT_NOGRAPHIC check outside milkymist_tmu2_create(), Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 13/21] vl: Replace DT_NOGRAPHIC with machine option, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 14/21] vl: Make display_type a local variable, Eduardo Habkost, 2016/05/20