From patchwork Tue Apr 19 19:55:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 612288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qqG6X1PnDz9t6J for ; Wed, 20 Apr 2016 05:58:44 +1000 (AEST) Received: from localhost ([::1]:35656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbnG-0001R9-9N for incoming@patchwork.ozlabs.org; Tue, 19 Apr 2016 15:58:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkS-0002tZ-NC for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1asbkQ-0007cR-OB for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46371) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkQ-0007cL-Iu for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:46 -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 2E27EC05E175 for ; Tue, 19 Apr 2016 19:55:46 +0000 (UTC) Received: from localhost (vpn1-5-236.gru2.redhat.com [10.97.5.236]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3JJtj8X015088; Tue, 19 Apr 2016 15:55:45 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 19 Apr 2016 16:55:22 -0300 Message-Id: <1461095728-22055-7-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.7 v3 06/12] gtk: Initialization stubs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcel Apfelbaum , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This reduces the number of CONFIG_GTK #ifdefs in vl.c. Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Move stub file to stubs/ui/ Changes v2 -> v3: * Add early_gtk_display_init() stub * Move stubs to header file --- include/ui/console.h | 17 +++++++++++++++++ vl.c | 7 +------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index 7ac997f..52a5f65 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -506,7 +506,24 @@ static inline void curses_display_init(DisplayState *ds, int full_screen) int index_from_key(const char *key, size_t key_length); /* gtk.c */ +#ifdef CONFIG_GTK void early_gtk_display_init(int opengl); void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover); +#else +static inline void gtk_display_init(DisplayState *ds, bool full_screen, + bool grab_on_hover) +{ + /* This must never be called if CONFIG_GTK is disabled */ + error_report("GTK support is disabled"); + abort(); +} + +static inline void early_gtk_display_init(int opengl) +{ + /* This must never be called if CONFIG_GTK is disabled */ + error_report("GTK support is disabled"); + abort(); +} +#endif #endif diff --git a/vl.c b/vl.c index 41cdb68..067d37e 100644 --- a/vl.c +++ b/vl.c @@ -146,9 +146,7 @@ int vga_interface_type = VGA_NONE; static int full_screen = 0; static int no_frame = 0; int no_quit = 0; -#ifdef CONFIG_GTK static bool grab_on_hover; -#endif CharDriverState *serial_hds[MAX_SERIAL_PORTS]; CharDriverState *parallel_hds[MAX_PARALLEL_PORTS]; CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES]; @@ -4244,11 +4242,10 @@ int main(int argc, char **argv, char **envp) "ignoring option"); } -#if defined(CONFIG_GTK) if (display_type == DT_GTK) { early_gtk_display_init(request_opengl); } -#endif + if (display_type == DT_SDL) { sdl_display_early_init(request_opengl); } @@ -4548,11 +4545,9 @@ int main(int argc, char **argv, char **envp) case DT_COCOA: cocoa_display_init(ds, full_screen); break; -#if defined(CONFIG_GTK) case DT_GTK: gtk_display_init(ds, full_screen, grab_on_hover); break; -#endif default: break; }