From patchwork Wed Mar 16 11:00:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 87239 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4BC40B700E for ; Wed, 16 Mar 2011 22:18:05 +1100 (EST) Received: from localhost ([127.0.0.1]:32839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pzojq-0003QV-R1 for incoming@patchwork.ozlabs.org; Wed, 16 Mar 2011 07:18:02 -0400 Received: from [140.186.70.92] (port=53494 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzoTD-0003tS-C1 for qemu-devel@nongnu.org; Wed, 16 Mar 2011 07:00:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzoTB-00057w-9q for qemu-devel@nongnu.org; Wed, 16 Mar 2011 07:00:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzoTA-00057n-Uw for qemu-devel@nongnu.org; Wed, 16 Mar 2011 07:00:49 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2GB0lrp010176 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 16 Mar 2011 07:00:47 -0400 Received: from red-feather.redhat.com (ovpn-113-63.phx2.redhat.com [10.3.113.63]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p2GB0bhT009865; Wed, 16 Mar 2011 07:00:46 -0400 From: Jes.Sorensen@redhat.com To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2011 12:00:12 +0100 Message-Id: <1300273214-19586-6-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1300273214-19586-1-git-send-email-Jes.Sorensen@redhat.com> References: <1300273214-19586-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: jan.kiszka@siemens.com, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH 5/7] error message if user specifies SDL cmd line option when SDL is disabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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 ac3c2e5..3e9a274 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -645,11 +645,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 @@ -658,42 +656,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 555bc49..1104636 100644 --- a/vl.c +++ b/vl.c @@ -2624,6 +2624,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;