From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58005 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzWRh-0004gS-QM for qemu-devel@nongnu.org; Tue, 15 Mar 2011 11:46:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzWRg-0008NE-O7 for qemu-devel@nongnu.org; Tue, 15 Mar 2011 11:46:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzWRg-0008Mv-FT for qemu-devel@nongnu.org; Tue, 15 Mar 2011 11:46:04 -0400 From: Jes.Sorensen@redhat.com Date: Tue, 15 Mar 2011 16:45:28 +0100 Message-Id: <1300203929-25823-7-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1300203929-25823-1-git-send-email-Jes.Sorensen@redhat.com> References: <1300203929-25823-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 6/7] error message if user specifies curses on cmd line when curses is disabled List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, peter.maydell@linaro.org From: Jes Sorensen Signed-off-by: Jes Sorensen --- qemu-options.hx | 2 -- vl.c | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 3e9a274..4220aad 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -632,11 +632,9 @@ the console. Therefore, you can still use QEMU to debug a Linux kernel with a serial console. ETEXI -#ifdef CONFIG_CURSES DEF("curses", 0, QEMU_OPTION_curses, "-curses use a curses/ncurses interface instead of SDL\n", QEMU_ARCH_ALL) -#endif STEXI @item -curses @findex curses diff --git a/vl.c b/vl.c index fb4f734..96ee883 100644 --- a/vl.c +++ b/vl.c @@ -2246,11 +2246,14 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_nographic: display_type = DT_NOGRAPHIC; break; -#ifdef CONFIG_CURSES case QEMU_OPTION_curses: +#ifdef CONFIG_CURSES display_type = DT_CURSES; - break; +#else + fprintf(stderr, "Curses support is disabled\n"); + exit(1); #endif + break; case QEMU_OPTION_portrait: graphic_rotate = 1; break; -- 1.7.4