From patchwork Thu Nov 12 19:02:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 543610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D19FD14012C for ; Fri, 13 Nov 2015 06:06:53 +1100 (AEDT) Received: from localhost ([::1]:49239 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwxCt-0000tx-QM for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2015 14:06:51 -0500 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) Received: from localhost (ovpn-113-159.phx2.redhat.com [10.3.113.159]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tACJ2fNM014811; Thu, 12 Nov 2015 14:02:42 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini Subject: [Qemu-devel] [PATCH v2 5/7] stubs: cocoa_display_init() stub X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);