From patchwork Fri Jun 14 19:09:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 251509 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6E0692C008A for ; Sat, 15 Jun 2013 05:10:05 +1000 (EST) Received: from localhost ([::1]:59136 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnZNp-0002JT-Au for incoming@patchwork.ozlabs.org; Fri, 14 Jun 2013 15:10:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnZNX-0002I6-Jv for qemu-devel@nongnu.org; Fri, 14 Jun 2013 15:09:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnZNW-0004J4-JK for qemu-devel@nongnu.org; Fri, 14 Jun 2013 15:09:43 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:44847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnZNW-0004IS-CR; Fri, 14 Jun 2013 15:09:42 -0400 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id D3BFE41664; Fri, 14 Jun 2013 23:09:39 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id C162150A; Fri, 14 Jun 2013 23:09:37 +0400 (MSK) From: Michael Tokarev To: Anthony Liguori Date: Fri, 14 Jun 2013 23:09:35 +0400 Message-Id: <1371236976-22500-1-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Peter Wu , Michael Tokarev , qemu-devel@nongnu.org, =?UTF-8?q?Vincent=20Stehl=C3=A9?= Subject: [Qemu-devel] [PATCH] Revert "Unbreak -no-quit for GTK, validate SDL options" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This reverts commit 047d4e151dd462915786a4fddc12f774d0028af5. The commit in question introduced old/legacy options (-no-quit and some more) for the new interface type (gtk), -- on the second thought I think we shouldn't do that, instead, we should use the display-specific options (like -display sdl,frame=no), and should not extend the legacy interface further which makes messy quite fast. And more, that change broke build without sdl, by referring to `no_frame' variable which were guarded by #if SDL. So reverting it for now I thinks is the best option. Further plan, I think, is to make the documentation more clear that these options are legacy. Cc: Peter Wu Cc: qemu-trivial@nongnu.org Signed-off-By: Michael Tokarev --- vl.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/vl.c b/vl.c index 9f8fd6e..169c807 100644 --- a/vl.c +++ b/vl.c @@ -3524,6 +3524,7 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_full_screen: full_screen = 1; break; +#ifdef CONFIG_SDL case QEMU_OPTION_no_frame: no_frame = 1; break; @@ -3536,11 +3537,14 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_no_quit: no_quit = 1; break; -#ifdef CONFIG_SDL 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); @@ -4081,15 +4085,6 @@ int main(int argc, char **argv, char **envp) #endif } - if ((no_frame || alt_grab || ctrl_grab) && display_type != DT_SDL) { - fprintf(stderr, "-no-frame, -alt-grab and -ctrl-grab are only valid " - "for SDL, ignoring option\n"); - } - if (no_quit && (display_type != DT_GTK && display_type != DT_SDL)) { - fprintf(stderr, "-no-quit is only valid for GTK and SDL, " - "ignoring option\n"); - } - #if defined(CONFIG_GTK) if (display_type == DT_GTK) { early_gtk_display_init();