From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48683 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pz6tm-0007Pn-BL for qemu-devel@nongnu.org; Mon, 14 Mar 2011 08:29:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pz6tg-0004Ji-K3 for qemu-devel@nongnu.org; Mon, 14 Mar 2011 08:29:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pz6tg-0004Ja-Ac for qemu-devel@nongnu.org; Mon, 14 Mar 2011 08:29:16 -0400 From: Jes.Sorensen@redhat.com Date: Mon, 14 Mar 2011 13:28:44 +0100 Message-Id: <1300105726-25937-4-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1300105726-25937-1-git-send-email-Jes.Sorensen@redhat.com> References: <1300105726-25937-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 3/5] error message if user specifies SDL cmd line option when SDL 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 | 10 ---------- vl.c | 8 ++++++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 21c0d97..960762a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -650,11 +650,9 @@ QEMU can display the VGA output when in text mode using a curses/ncurses interface. Nothing is displayed in graphical mode. ETEXI -#ifdef CONFIG_SDL DEF("no-frame", 0, QEMU_OPTION_no_frame, "-no-frame open SDL window without a frame and window decorations\n", QEMU_ARCH_ALL) -#endif STEXI @item -no-frame @findex -no-frame @@ -663,42 +661,34 @@ available screen space. This makes the using QEMU in a dedicated desktop workspace more convenient. ETEXI -#ifdef CONFIG_SDL DEF("alt-grab", 0, QEMU_OPTION_alt_grab, "-alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt)\n", QEMU_ARCH_ALL) -#endif STEXI @item -alt-grab @findex -alt-grab Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt). ETEXI -#ifdef CONFIG_SDL DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab, "-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n", QEMU_ARCH_ALL) -#endif STEXI @item -ctrl-grab @findex -ctrl-grab Use Right-Ctrl to grab mouse (instead of Ctrl-Alt). ETEXI -#ifdef CONFIG_SDL DEF("no-quit", 0, QEMU_OPTION_no_quit, "-no-quit disable SDL window close capability\n", QEMU_ARCH_ALL) -#endif STEXI @item -no-quit @findex -no-quit Disable SDL window close capability. ETEXI -#ifdef CONFIG_SDL DEF("sdl", 0, QEMU_OPTION_sdl, "-sdl enable SDL\n", QEMU_ARCH_ALL) -#endif STEXI @item -sdl @findex -sdl diff --git a/vl.c b/vl.c index 8ed4607..ab78e4c 100644 --- a/vl.c +++ b/vl.c @@ -2569,6 +2569,14 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_sdl: display_type = DT_SDL; break; +#else + case QEMU_OPTION_no_frame: + case QEMU_OPTION_alt_grab: + case QEMU_OPTION_ctrl_grab: + case QEMU_OPTION_no_quit: + case QEMU_OPTION_sdl: + fprintf(stderr, "SDL support is disabled\n"); + exit(1); #endif case QEMU_OPTION_pidfile: pid_file = optarg; -- 1.7.4