From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx8s-0001E8-Ek for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zwx8r-0004yM-C6 for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx8r-0004yI-7G for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:41 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id D289E19CBD8 for ; Thu, 12 Nov 2015 19:02:40 +0000 (UTC) From: Eduardo Habkost Date: Thu, 12 Nov 2015 17:02:15 -0200 Message-Id: <1447354938-1575-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1447354938-1575-1-git-send-email-ehabkost@redhat.com> References: <1447354938-1575-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/7] stubs: SDL initialization stubs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini 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/ --- 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