From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48013 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzpvZ-00045j-9x for qemu-devel@nongnu.org; Wed, 16 Mar 2011 08:34:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzpvY-00045e-2F for qemu-devel@nongnu.org; Wed, 16 Mar 2011 08:34:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzpvX-00045R-QE for qemu-devel@nongnu.org; Wed, 16 Mar 2011 08:34:12 -0400 From: Jes.Sorensen@redhat.com Date: Wed, 16 Mar 2011 13:33:35 +0100 Message-Id: <1300278816-29513-7-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1300278816-29513-1-git-send-email-Jes.Sorensen@redhat.com> References: <1300278816-29513-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 1193d94..ef60730 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -634,11 +634,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 1104636..4ab3d79 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