From nobody Fri Oct 24 22:13:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519134571750532.4976516862062; Tue, 20 Feb 2018 05:49:31 -0800 (PST) Received: from localhost ([::1]:55629 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eo8IV-0006Gi-1p for importer@patchew.org; Tue, 20 Feb 2018 08:49:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eo8Gh-0005Ge-Fw for qemu-devel@nongnu.org; Tue, 20 Feb 2018 08:47:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eo8Ge-0006yf-LV for qemu-devel@nongnu.org; Tue, 20 Feb 2018 08:47:39 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:33168 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eo8Ge-0006xi-Gf for qemu-devel@nongnu.org; Tue, 20 Feb 2018 08:47:36 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0EC4A4015177 for ; Tue, 20 Feb 2018 13:47:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-147.ams2.redhat.com [10.36.116.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id 020E0AB588; Tue, 20 Feb 2018 13:47:29 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DF6B817528; Tue, 20 Feb 2018 14:47:23 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 20 Feb 2018 14:47:16 +0100 Message-Id: <20180220134723.11776-6-kraxel@redhat.com> In-Reply-To: <20180220134723.11776-1-kraxel@redhat.com> References: <20180220134723.11776-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 20 Feb 2018 13:47:36 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 20 Feb 2018 13:47:36 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 05/12] vl: drop no_quit variable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Not used any more, delete it. Signed-off-by: Gerd Hoffmann Message-id: 20180202111022.19269-7-kraxel@redhat.com Signed-off-by: Gerd Hoffmann --- vl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vl.c b/vl.c index 61b72758a8..f52bc3b879 100644 --- a/vl.c +++ b/vl.c @@ -153,7 +153,6 @@ int vga_interface_type =3D VGA_NONE; static int full_screen =3D 0; static DisplayOptions dpy; int no_frame; -int no_quit =3D 0; Chardev *serial_hds[MAX_SERIAL_PORTS]; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; Chardev *virtcon_hds[MAX_VIRTIO_CONSOLES]; @@ -2138,10 +2137,8 @@ static LegacyDisplayType select_display(const char *= p) opts =3D nextopt; dpy.has_window_close =3D true; if (strstart(opts, "on", &nextopt)) { - no_quit =3D 0; dpy.window_close =3D true; } else if (strstart(opts, "off", &nextopt)) { - no_quit =3D 1; dpy.window_close =3D false; } else { goto invalid_sdl_args; @@ -3668,7 +3665,6 @@ int main(int argc, char **argv, char **envp) ctrl_grab =3D 1; break; case QEMU_OPTION_no_quit: - no_quit =3D 1; dpy.has_window_close =3D true; dpy.window_close =3D false; break; @@ -4357,7 +4353,8 @@ int main(int argc, char **argv, char **envp) error_report("-no-frame, -alt-grab and -ctrl-grab are only valid " "for SDL, ignoring option"); } - if (no_quit && (display_type !=3D DT_GTK && display_type !=3D DT_SDL))= { + if (dpy.has_window_close && + (display_type !=3D DT_GTK && display_type !=3D DT_SDL)) { error_report("-no-quit is only valid for GTK and SDL, " "ignoring option"); } --=20 2.9.3