From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkO-0002kp-8q for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1asbkN-0007be-Dp for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35532) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkN-0007bU-71 for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:43 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C9B4481110 for ; Tue, 19 Apr 2016 19:55:42 +0000 (UTC) From: Eduardo Habkost Date: Tue, 19 Apr 2016 16:55:20 -0300 Message-Id: <1461095728-22055-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1461095728-22055-1-git-send-email-ehabkost@redhat.com> References: <1461095728-22055-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH for-2.7 v3 04/12] sdl: Initialization stubs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Marcel Apfelbaum This reduces the number of CONFIG_SDL #ifdefs in vl.c. Signed-off-by: Eduardo Habkost --- 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