From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx90-0001UY-4L for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zwx8v-00050c-N8 for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58179) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx8v-00050R-J0 for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:45 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 37A998E380 for ; Thu, 12 Nov 2015 19:02:45 +0000 (UTC) From: Eduardo Habkost Date: Thu, 12 Nov 2015 17:02:17 -0200 Message-Id: <1447354938-1575-7-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 6/7] stubs: gtk_display_init() stub 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_GTK #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/gtk.c | 10 ++++++++++ vl.c | 4 ---- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 stubs/ui/gtk.c diff --git a/stubs/ui/Makefile.objs b/stubs/ui/Makefile.objs index ce9a0ce..cdf87fe 100644 --- a/stubs/ui/Makefile.objs +++ b/stubs/ui/Makefile.objs @@ -2,3 +2,4 @@ stub-obj-y += vnc.o stub-obj-y += curses.o stub-obj-y += sdl.o stub-obj-y += cocoa.o +stub-obj-y += gtk.o diff --git a/stubs/ui/gtk.c b/stubs/ui/gtk.c new file mode 100644 index 0000000..a46ef0c --- /dev/null +++ b/stubs/ui/gtk.c @@ -0,0 +1,10 @@ +#include "qemu-common.h" +#include "ui/console.h" +#include "qemu/error-report.h" + +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(); +} diff --git a/vl.c b/vl.c index ea83e17..d4191d6 100644 --- a/vl.c +++ b/vl.c @@ -151,9 +151,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]; @@ -4576,11 +4574,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; } -- 2.1.0