From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx8q-0001Au-9b for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zwx8p-0004y8-BT for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43771) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx8p-0004y4-62 for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:39 -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 CA95DC00040E for ; Thu, 12 Nov 2015 19:02:38 +0000 (UTC) From: Eduardo Habkost Date: Thu, 12 Nov 2015 17:02:14 -0200 Message-Id: <1447354938-1575-4-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 3/7] stubs: curses_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/curses.c | 10 ++++++++++ vl.c | 2 -- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 stubs/ui/curses.c diff --git a/stubs/ui/Makefile.objs b/stubs/ui/Makefile.objs index 16ea29a..2f63c58 100644 --- a/stubs/ui/Makefile.objs +++ b/stubs/ui/Makefile.objs @@ -1 +1,2 @@ stub-obj-y += vnc.o +stub-obj-y += curses.o diff --git a/stubs/ui/curses.c b/stubs/ui/curses.c new file mode 100644 index 0000000..2115c77 --- /dev/null +++ b/stubs/ui/curses.c @@ -0,0 +1,10 @@ +#include "qemu-common.h" +#include "ui/console.h" +#include "qemu/error-report.h" + +void curses_display_init(DisplayState *ds, int full_screen) +{ + /* This must never be called if CONFIG_CURSES is disabled */ + error_report("curses support is disabled"); + abort(); +} diff --git a/vl.c b/vl.c index 0558e87..3ca1c11 100644 --- a/vl.c +++ b/vl.c @@ -4568,11 +4568,9 @@ int main(int argc, char **argv, char **envp) case DT_NOGRAPHIC: (void)ds; /* avoid warning if no display is configured */ break; -#if defined(CONFIG_CURSES) case DT_CURSES: curses_display_init(ds, full_screen); break; -#endif #if defined(CONFIG_SDL) case DT_SDL: sdl_display_init(ds, full_screen, no_frame); -- 2.1.0