From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx8x-0001OR-Kn for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zwx8t-0004z5-PA for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx8t-0004yo-Da for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:43 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 055E2A100F for ; Thu, 12 Nov 2015 19:02:42 +0000 (UTC) From: Eduardo Habkost Date: Thu, 12 Nov 2015 17:02:16 -0200 Message-Id: <1447354938-1575-6-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 5/7] stubs: cocoa_display_init() stub List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini One less #ifdef in vl.c. Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Move stub file to stubs/ui/ --- stubs/ui/Makefile.objs | 1 + stubs/ui/cocoa.c | 10 ++++++++++ vl.c | 2 -- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 stubs/ui/cocoa.c diff --git a/stubs/ui/Makefile.objs b/stubs/ui/Makefile.objs index 2e4c924..ce9a0ce 100644 --- a/stubs/ui/Makefile.objs +++ b/stubs/ui/Makefile.objs @@ -1,3 +1,4 @@ stub-obj-y += vnc.o stub-obj-y += curses.o stub-obj-y += sdl.o +stub-obj-y += cocoa.o diff --git a/stubs/ui/cocoa.c b/stubs/ui/cocoa.c new file mode 100644 index 0000000..ef07a8a --- /dev/null +++ b/stubs/ui/cocoa.c @@ -0,0 +1,10 @@ +#include "qemu-common.h" +#include "ui/console.h" +#include "qemu/error-report.h" + +void cocoa_display_init(DisplayState *ds, int full_screen) +{ + /* This must never be called if CONFIG_COCA is disabled */ + error_report("Cocoa support is disabled"); + abort(); +} diff --git a/vl.c b/vl.c index 5292648..ea83e17 100644 --- a/vl.c +++ b/vl.c @@ -4573,11 +4573,9 @@ int main(int argc, char **argv, char **envp) case DT_SDL: sdl_display_init(ds, full_screen, no_frame); break; -#if defined(CONFIG_COCOA) case DT_COCOA: cocoa_display_init(ds, full_screen); break; -#endif #if defined(CONFIG_GTK) case DT_GTK: gtk_display_init(ds, full_screen, grab_on_hover); -- 2.1.0