From nobody Sun May 5 20:32:12 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549351851688366.8487652539387; Mon, 4 Feb 2019 23:30:51 -0800 (PST) Received: from localhost ([127.0.0.1]:55619 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqvBn-0005SQ-Vb for importer@patchew.org; Tue, 05 Feb 2019 02:30:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqvAv-000548-LE for qemu-devel@nongnu.org; Tue, 05 Feb 2019 02:29:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqvAu-0007Im-3u for qemu-devel@nongnu.org; Tue, 05 Feb 2019 02:29:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57750) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gqvAs-00078y-63 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 02:29:44 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2305081F0C for ; Tue, 5 Feb 2019 07:29:40 +0000 (UTC) Received: from thuth.com (ovpn-116-166.ams2.redhat.com [10.36.116.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5A5067159; Tue, 5 Feb 2019 07:29:33 +0000 (UTC) From: Thomas Huth To: Gerd Hoffmann , qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 08:29:29 +0100 Message-Id: <1549351769-19620-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 05 Feb 2019 07:29:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] Remove deprecated -no-frame option 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The -no-frame option has been deprecated with QEMU v2.12. It was only useful with SDL1.2 - now that we've removed support for SDL1.2, we can certainly remove the -no-frame option, too. Signed-off-by: Thomas Huth --- include/sysemu/sysemu.h | 1 - qemu-deprecated.texi | 6 ------ qemu-options.hx | 11 ----------- vl.c | 23 +++-------------------- 4 files changed, 3 insertions(+), 38 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 85877b7..4b5a6b7 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -102,7 +102,6 @@ extern const char *keyboard_layout; extern int win2k_install_hack; extern int alt_grab; extern int ctrl_grab; -extern int no_frame; extern int smp_cpus; extern unsigned int max_cpus; extern int cursor_hide; diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 9cc20b3..0b508e7 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -37,12 +37,6 @@ would automatically enable USB support on the machine ty= pe. If using the new syntax, USB support must be explicitly enabled via the ``-machine usb=3Don'' argument. =20 -@subsection -no-frame (since 2.12.0) - -The @code{--no-frame} argument works with SDL 1.2 only. The other user -interfaces never implemented this in the first place. So this will be -removed together with SDL 1.2 support. - @subsection -virtioconsole (since 3.0.0) =20 Option @option{-virtioconsole} has been replaced by diff --git a/qemu-options.hx b/qemu-options.hx index 521511e..0180467 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1294,17 +1294,6 @@ mode using a curses/ncurses interface. Nothing is di= splayed in graphical mode. ETEXI =20 -DEF("no-frame", 0, QEMU_OPTION_no_frame, - "-no-frame open SDL window without a frame and window decoration= s\n", - QEMU_ARCH_ALL) -STEXI -@item -no-frame -@findex -no-frame -Do not use decorations for SDL windows and start them using the whole -available screen space. This makes the using QEMU in a dedicated desktop -workspace more convenient. -ETEXI - 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) diff --git a/vl.c b/vl.c index 9cf0fbe..33d226f 100644 --- a/vl.c +++ b/vl.c @@ -160,7 +160,6 @@ static int rtc_host_datetime_offset =3D -1; /* valid & = used only with QEMUClockType rtc_clock; int vga_interface_type =3D VGA_NONE; static DisplayOptions dpy; -int no_frame; static int num_serial_hds; static Chardev **serial_hds; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; @@ -2113,18 +2112,7 @@ static void parse_display(const char *p) while (*opts) { const char *nextopt; =20 - if (strstart(opts, ",frame=3D", &nextopt)) { - g_printerr("The frame=3D sdl option is deprecated, and wil= l be\n" - "removed in a future release.\n"); - opts =3D nextopt; - if (strstart(opts, "on", &nextopt)) { - no_frame =3D 0; - } else if (strstart(opts, "off", &nextopt)) { - no_frame =3D 1; - } else { - goto invalid_sdl_args; - } - } else if (strstart(opts, ",alt_grab=3D", &nextopt)) { + if (strstart(opts, ",alt_grab=3D", &nextopt)) { opts =3D nextopt; if (strstart(opts, "on", &nextopt)) { alt_grab =3D 1; @@ -3596,11 +3584,6 @@ int main(int argc, char **argv, char **envp) dpy.has_full_screen =3D true; dpy.full_screen =3D true; break; - case QEMU_OPTION_no_frame: - g_printerr("The -no-frame switch is deprecated, and will b= e\n" - "removed in a future release.\n"); - no_frame =3D 1; - break; case QEMU_OPTION_alt_grab: alt_grab =3D 1; break; @@ -4279,8 +4262,8 @@ int main(int argc, char **argv, char **envp) dpy.type =3D DISPLAY_TYPE_NONE; } =20 - if ((no_frame || alt_grab || ctrl_grab) && dpy.type !=3D DISPLAY_TYPE_= SDL) { - error_report("-no-frame, -alt-grab and -ctrl-grab are only valid " + if ((alt_grab || ctrl_grab) && dpy.type !=3D DISPLAY_TYPE_SDL) { + error_report("-alt-grab and -ctrl-grab are only valid " "for SDL, ignoring option"); } if (dpy.has_window_close && --=20 1.8.3.1