From nobody Sun May 19 06:23:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1625071159; cv=none; d=zohomail.com; s=zohoarc; b=UpJeVR9ZcWT38mbAxknnln72ayzWvFB8G09s/0maT/akUeWYcu+DHpyaiuNvZgjiaZYvFSqMvEDn4zOxDWdIPZmQEY6YSdzP+xfSKmuAYF+GauWkdX0trxxO7smXct20p5PnG4jtn0a5odvA90GmNP4IVPYrEQXCX+JKhWr/YkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625071159; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KOwakb4DbYF5Oj5MfGQL9K1iGVKbFN+e5xYjmd/dnvU=; b=E+Q1/qv7m6ZSjA+c5oxbc+sx2/c10uas/yJQdpCZTFYoSUAqAK+uBFuzBlnjgZiUO5Txo5DMRIHRz4TeNsyTDlVG1dOigZXVy45km4wZ5uzalvZlKcM+NeO0cnkGke7rKBHpN02U0LBxUg3kKBzNjoYyR2AywXVjbhldJ40jQoA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625071159193529.7208413215578; Wed, 30 Jun 2021 09:39:19 -0700 (PDT) Received: from localhost ([::1]:39676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lydF7-0003QJ-JV for importer@patchew.org; Wed, 30 Jun 2021 12:39:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyd92-0005Hn-4G for qemu-devel@nongnu.org; Wed, 30 Jun 2021 12:33:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57977) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyd8n-0000Hi-En for qemu-devel@nongnu.org; Wed, 30 Jun 2021 12:32:59 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-86-paskCGtCPByNxOnhRnzY3w-1; Wed, 30 Jun 2021 12:32:40 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76552804141 for ; Wed, 30 Jun 2021 16:32:39 +0000 (UTC) Received: from thuth.com (ovpn-113-129.ams2.redhat.com [10.36.113.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BD2B5C1A3; Wed, 30 Jun 2021 16:32:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625070761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KOwakb4DbYF5Oj5MfGQL9K1iGVKbFN+e5xYjmd/dnvU=; b=Oh/LLTSiS7ZgM/f6yGMgsRLZTbDde/UCo1ML8hzFprdBwdNLtICzj+WqHGACby3jrDG6nm HejHnTDiTmFDEoP1xoZPMWwyBbPLFyq9srlu42fx7Fr9hlpskDQdcXJfZnWK/H9jJQqF1i 7/9u9BZNqp7hOFhp0aDbMUCHKuY7x+g= X-MC-Unique: paskCGtCPByNxOnhRnzY3w-1 From: Thomas Huth To: qemu-devel@nongnu.org, kraxel@redhat.com Subject: [PATCH 1/4] softmmu/vl: Remove obsolete comment about the "frame" parameter Date: Wed, 30 Jun 2021 18:32:28 +0200 Message-Id: <20210630163231.467987-2-thuth@redhat.com> In-Reply-To: <20210630163231.467987-1-thuth@redhat.com> References: <20210630163231.467987-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.435, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The frame parameter has been removed along with the support for SDL 1.2. Fixes: 09bd7ba9f5 ("Remove deprecated -no-frame option") Signed-off-by: Thomas Huth --- softmmu/vl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index d99e2cbdbf..cee6339580 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1062,8 +1062,6 @@ static void parse_display(const char *p) * sdl DisplayType needs hand-crafted parser instead of * parse_display_qapi() due to some options not in * DisplayOptions, specifically: - * - frame - * Already deprecated. * - ctrl_grab + alt_grab * Not clear yet what happens to them long-term. Should * replaced by something better or deprecated and dropped. --=20 2.27.0 From nobody Sun May 19 06:23:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1625070994; cv=none; d=zohomail.com; s=zohoarc; b=fdJzVs/OnsppkynFrs+SjbbtEVFy0McmAAiCJkCVvBnr1aiKXh3M+4MN2V9lAWW5s8reL//BEDSXusYjEm0tI/keNWh+RCJCO8RE8oybzc+J+M0ZnybvWcBTyCxUv/vVWV7vgtClzrcMfaqQBkZNZzA8p8jTFKJJl1mv3Kad0/8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625070994; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4ydAJNihEcdfk3BDCQib5K3UK+CJuTNdU2Xrhsb3NEI=; b=YxjLQ3WfPoDixUHYL8VX/5TQuhqNRCHw1W2gAHJS6DH2+rzZoDQFMLHxElX5Xeqve5aGzsliejWZe6EuNmYxlqOWNeQjNxFwHHvw63tAp15QxejzgI/sg4RyBVWxnL04Io86g3PtiD4m1n8W0QV0ywL0t1Gmalz3TXqA8HmivRE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625070994366868.1409908870737; Wed, 30 Jun 2021 09:36:34 -0700 (PDT) Received: from localhost ([::1]:33244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lydCS-0007PQ-R7 for importer@patchew.org; Wed, 30 Jun 2021 12:36:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyd94-0005Jx-IB for qemu-devel@nongnu.org; Wed, 30 Jun 2021 12:33:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyd8q-0000Iy-HI for qemu-devel@nongnu.org; Wed, 30 Jun 2021 12:33:02 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-564-rUuPGFuKO3iD-I04HnbOIg-1; Wed, 30 Jun 2021 12:32:45 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BDE8219253C2 for ; Wed, 30 Jun 2021 16:32:44 +0000 (UTC) Received: from thuth.com (ovpn-113-129.ams2.redhat.com [10.36.113.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF0F85C1A3; Wed, 30 Jun 2021 16:32:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625070767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4ydAJNihEcdfk3BDCQib5K3UK+CJuTNdU2Xrhsb3NEI=; b=gCsWBrrt0QiqjSHymX8d7DE27V5v78CcKBl8TZ1nnR+3qPiYkFrSKEtIABJ+PeKNJoay8A DXQa3fWndrZoSDBQYABUIpKMg8B154zLcgVPeDuKm+J/PQ7J29hFfFxRYVJxkEO4rMXirl 0LAzsRb2/jAVZrKI1SPPdWoqug3c/B4= X-MC-Unique: rUuPGFuKO3iD-I04HnbOIg-1 From: Thomas Huth To: qemu-devel@nongnu.org, kraxel@redhat.com Subject: [PATCH 2/4] ui: Fix the "-display sdl,window_close=..." parameter Date: Wed, 30 Jun 2021 18:32:29 +0200 Message-Id: <20210630163231.467987-3-thuth@redhat.com> In-Reply-To: <20210630163231.467987-1-thuth@redhat.com> References: <20210630163231.467987-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.435, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" According to the QAPI schema, there is a "-" and not a "_" between "window" and "close", and we're also talking about "window-close" in the long parameter description in qemu-options.hx, so we should make sure that we rather use the variant with the "-" by default instead of only allowing the one with the "_" here. The old way still stays enabled for compatibility, but we deprecate it, so that we can switch to a QAPIfied parameter one day more easily. Signed-off-by: Thomas Huth --- docs/system/deprecated.rst | 6 ++++++ qemu-options.hx | 2 +- softmmu/vl.c | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index e2e0090878..bb624d3170 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -126,6 +126,12 @@ other options have been processed. This will either h= ave no effect (if if they were not given. The property is therefore useless and should not = be specified. =20 +``-display sdl,window_close=3D...`` (since 6.1) +''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-display sdl,window-close=3D...`` instead (i.e. with a minus instead= of +an underscore between "window" and "close"). + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/qemu-options.hx b/qemu-options.hx index ba3ca9da1d..ae56fa4f28 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1784,7 +1784,7 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, #endif #if defined(CONFIG_SDL) "-display sdl[,alt_grab=3Don|off][,ctrl_grab=3Don|off]\n" - " [,window_close=3Don|off][,gl=3Don|core|es|off]\n" + " [,window-close=3Don|off][,gl=3Don|core|es|off]\n" #endif #if defined(CONFIG_GTK) "-display gtk[,grab_on_hover=3Don|off][,gl=3Don|off]|\n" diff --git a/softmmu/vl.c b/softmmu/vl.c index cee6339580..36b761677d 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1089,7 +1089,12 @@ static void parse_display(const char *p) } else { goto invalid_sdl_args; } - } else if (strstart(opts, ",window_close=3D", &nextopt)) { + } else if (strstart(opts, ",window_close=3D", &nextopt) || + strstart(opts, ",window-close=3D", &nextopt)) { + if (strstart(opts, ",window_close=3D", NULL)) { + warn_report("window_close with an underscore is deprec= ated," + " please use window-close instead."); + } opts =3D nextopt; dpy.has_window_close =3D true; if (strstart(opts, "on", &nextopt)) { --=20 2.27.0 From nobody Sun May 19 06:23:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1625070994; cv=none; d=zohomail.com; s=zohoarc; b=fTgUPmUzn3rfxtj2TIPnDd+ffIpNVr33aNjih5ikncp7krPIMcnCoIvs5PYqRpW+Xhx5kU89RMs57DaqyHPAzarYuLwDx/lXWd4rnZNbkFCWKeOaDa96GQt/x914qxgOELPPTv521eF8V04Mha87v3R3I2Qeo/f7HlyuKwpx+jc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625070994; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wfEugb6DcQqvdzNLNiCiRlAcEDO5vSelAQwY9MmKOJY=; b=cfdVozOVLMXEIdZpyAqaQXtGMck5DG+dgf6QXQYGGumtUHErud72AJBGxSBFFc7e0rvUIP8ywsOXdbv6e6dsoVqKZ3DZAvJDhY5pbTA+pQQvFe2Cc7AVRpEZ0mpvo5RpaxalVgm+o/AdTJgWhq8ilCoUPnng9sWS3n/lgFCTK+A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16250709941115.201610104533188; Wed, 30 Jun 2021 09:36:34 -0700 (PDT) Received: from localhost ([::1]:33230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lydCT-0007P2-0U for importer@patchew.org; Wed, 30 Jun 2021 12:36:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyd94-0005JX-65 for qemu-devel@nongnu.org; Wed, 30 Jun 2021 12:33:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyd8w-0000Kd-7S for qemu-devel@nongnu.org; Wed, 30 Jun 2021 12:33:01 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-341-jYO14GitODaJkg9Qzxec2g-1; Wed, 30 Jun 2021 12:32:50 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 75B3D1023F40 for ; Wed, 30 Jun 2021 16:32:49 +0000 (UTC) Received: from thuth.com (ovpn-113-129.ams2.redhat.com [10.36.113.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3102E5C1A3; Wed, 30 Jun 2021 16:32:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625070772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wfEugb6DcQqvdzNLNiCiRlAcEDO5vSelAQwY9MmKOJY=; b=eOM33luNs6Vwfrq3o0RLCJkWv0Q4XtNj1Td6HLCGkRMKaMvhZ1gusCufSuAJXLdLXiwalV dQnjb05ivScxQ+clM7wSwwg1zrPpJmUbVdo2C8xaX2lxDf5eeE3E9oLzA7qYE7uWM+V5/8 EXPgYEnuWPD/RBGYlCc9SC9PIjJCWao= X-MC-Unique: jYO14GitODaJkg9Qzxec2g-1 From: Thomas Huth To: qemu-devel@nongnu.org, kraxel@redhat.com Subject: [PATCH 3/4] ui: Mark the '-no-quit' option as deprecated Date: Wed, 30 Jun 2021 18:32:30 +0200 Message-Id: <20210630163231.467987-4-thuth@redhat.com> In-Reply-To: <20210630163231.467987-1-thuth@redhat.com> References: <20210630163231.467987-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.435, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" X-ZohoMail-DKIM: pass (identity @redhat.com) It's just a wrapper around the -display ...,window-close=3Doff parameter, and the name "no-quit" is rather confusing compared to "window-close" (since there are still other means to quit the emulator), so we should rather tell our users to use the "window-close" parameter instead. While we're at it, update the documentation to state that "-no-quit" is available for GTK, too, not only for SDL. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- docs/system/deprecated.rst | 6 ++++++ qemu-options.hx | 5 +++-- softmmu/vl.c | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index bb624d3170..70e08baff6 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -132,6 +132,12 @@ specified. Use ``-display sdl,window-close=3D...`` instead (i.e. with a minus instead= of an underscore between "window" and "close"). =20 +``-no-quit`` (since 6.1) +'''''''''''''''''''''''' + +The ``-no-quit`` is a synonym for ``-display ...,window-close=3Doff`` which +should be used instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/qemu-options.hx b/qemu-options.hx index ae56fa4f28..c862f1fa57 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1910,10 +1910,11 @@ SRST ERST =20 DEF("no-quit", 0, QEMU_OPTION_no_quit, - "-no-quit disable SDL window close capability\n", QEMU_ARCH_ALL) + "-no-quit disable SDL/GTK window close capability (deprecated)\= n", QEMU_ARCH_ALL) SRST ``-no-quit`` - Disable SDL window close capability. + Disable window close capability (SDL and GTK only). This option is + deprecated, please use ``-display ...,window-close=3Doff`` instead. ERST =20 DEF("sdl", 0, QEMU_OPTION_sdl, diff --git a/softmmu/vl.c b/softmmu/vl.c index 36b761677d..7dd2d72d0b 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3237,6 +3237,8 @@ void qemu_init(int argc, char **argv, char **envp) case QEMU_OPTION_no_quit: dpy.has_window_close =3D true; dpy.window_close =3D false; + warn_report("-no-quit is deprecated, please use " + "-display ...,window-close=3Doff instead."); break; case QEMU_OPTION_sdl: #ifdef CONFIG_SDL --=20 2.27.0 From nobody Sun May 19 06:23:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1625071242; cv=none; d=zohomail.com; s=zohoarc; b=OwCU8LbT5bcuO1bCMHlGAc4fx4pctPcagoMHRfRgC42kj6U8/ZTteBYYhJP1uWcvFdZhKp+V7Pjav9+SREOpEwhzg6qoyCxYuYIKS5gduk6LI9y9K5sRDEaBGgeORGHlkC0oueMjLQTuJzN6jPdK21xn+b40ed2PC0py+yhqp9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625071242; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=M51bOoNjPAmBMy69JSkM64p+7Wj+p5NzWjA+GJAgD4I=; b=YTeT1xt5mX0vlqhBpxauDp/1Xfc6nOvUNu+15x1fi3fK17UC3rQp/qbyltwlwcOuLsGxlo0kUlmk/8x0tLklmfL+l2uXkNLgzuODtNZRjhhgZBUHEQ4eF9vZQDqFicqPr74FNYo09zTFNDBZqmfcydd14xtJsZ/yTWKHImUVtEo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625071242779454.7962939286065; Wed, 30 Jun 2021 09:40:42 -0700 (PDT) Received: from localhost ([::1]:41882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lydGR-0004u2-GJ for importer@patchew.org; Wed, 30 Jun 2021 12:40:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyd93-0005IT-19 for qemu-devel@nongnu.org; Wed, 30 Jun 2021 12:33:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyd8z-0000LR-Tk for qemu-devel@nongnu.org; Wed, 30 Jun 2021 12:33:00 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-435-LiyvFY84MpCtRbZ3oYLZeA-1; Wed, 30 Jun 2021 12:32:51 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C956D804140 for ; Wed, 30 Jun 2021 16:32:50 +0000 (UTC) Received: from thuth.com (ovpn-113-129.ams2.redhat.com [10.36.113.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC7BB5C1A3; Wed, 30 Jun 2021 16:32:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625070773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M51bOoNjPAmBMy69JSkM64p+7Wj+p5NzWjA+GJAgD4I=; b=QtPCExCvIH7NgHbYhv50wFP++hWx0FsuSe49Ilc14BCMlIoJwTPld4klw3wAkjplynA8r7 ubvLPqHO55dinXmvM5r6tpBh1eReCWhYg23gbGPn6zUEv/wR8z29mtgGI8B3DqMhrJyCBH uYWHd7+cjR+SJ23H/bxTs2PFlWqbZgw= X-MC-Unique: LiyvFY84MpCtRbZ3oYLZeA-1 From: Thomas Huth To: qemu-devel@nongnu.org, kraxel@redhat.com Subject: [PATCH 4/4] qemu-options: Improve the documentation of the -display options Date: Wed, 30 Jun 2021 18:32:31 +0200 Message-Id: <20210630163231.467987-5-thuth@redhat.com> In-Reply-To: <20210630163231.467987-1-thuth@redhat.com> References: <20210630163231.467987-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.435, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The sdl and gtk display options support more parameters than currently documented. Also the "vnc" option got lost during a recent commit, add it again. Fixes: ddc717581c ("Add display suboptions to man pages") Signed-off-by: Thomas Huth --- qemu-options.hx | 45 +++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index c862f1fa57..8965dabc83 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1783,11 +1783,12 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, "-display spice-app[,gl=3Don|off]\n" #endif #if defined(CONFIG_SDL) - "-display sdl[,alt_grab=3Don|off][,ctrl_grab=3Don|off]\n" - " [,window-close=3Don|off][,gl=3Don|core|es|off]\n" + "-display sdl[,alt_grab=3Don|off][,ctrl_grab=3Don|off][,gl=3Don|core|e= s|off]\n" + " [,show-cursor=3Don|off][,window-close=3Don|off]\n" #endif #if defined(CONFIG_GTK) - "-display gtk[,grab_on_hover=3Don|off][,gl=3Don|off]|\n" + "-display gtk[,full-screen=3Don|off][,gl=3Don|off][,grab-on-hover=3Don= |off]\n" + " [,show-cursor=3Don|off][,window-close=3Don|off]\n" #endif #if defined(CONFIG_VNC) "-display vnc=3D[,]\n" @@ -1824,17 +1825,37 @@ SRST application. The Spice server will redirect the serial consoles and QEMU monitors. (Since 4.0) =20 - ``sdl[,window-close=3Don|off][,gl=3Don|core|es|off]`` - + ``sdl`` Display video output via SDL (usually in a separate graphics window; see the SDL documentation for other possibilities). + Valid parameters are: + + ``alt_grab=3Don|off`` : Use Control+Alt+Shift-g to toggle mouse gr= abbing + + ``ctrl_grab=3Don|off`` : Use Right-Control-g to toggle mouse grabb= ing + + ``gl=3Don|off|core|es`` : Use OpenGL for displaying =20 - ``gtk[,grab-on-hover=3Don|off][,gl=3Don|off]`` + ``show-cursor=3Don|off`` : Force showing the mouse cursor + + ``window-close=3Don|off`` : Allow to quit qemu with window close b= utton + + ``gtk`` Display video output in a GTK window. This interface provides drop-down menus and other UI elements to configure and control - the VM during runtime. + the VM during runtime. Valid parameters are: + + ``full-screen=3Don|off`` : Start in fullscreen mode + + ``gl=3Don|off`` : Use OpenGL for displaying =20 - ``curses [,charset=3D]`` + ``grab-on-hover=3Don|off`` : Grab keyboard input on mouse hover + + ``show-cursor=3Don|off`` : Force showing the mouse cursor + + ``window-close=3Don|off`` : Allow to quit qemu with window close b= utton + + ``curses[,charset=3D]`` Display video output via curses. For graphics device models which support a text mode, QEMU can display this output using a curses/ncurses interface. Nothing is displayed when the graphics @@ -1845,11 +1866,14 @@ SRST ``charset=3DCP850`` for IBM CP850 encoding. The default is ``CP437``. =20 - ``egl-headless[,rendernode]`` + ``egl-headless[,rendernode=3D]`` Offload all OpenGL operations to a local DRI device. For any graphical display, this display needs to be paired with either VNC or SPICE displays. =20 + ``vnc=3D`` + Start a VNC server on display + ``none`` Do not display video output. The guest will still see an emulated graphics card, but its output will not be displayed to @@ -1857,9 +1881,6 @@ SRST that it only affects what is done with video output; -nographic also changes the destination of the serial and parallel port data. - - - ERST =20 DEF("nographic", 0, QEMU_OPTION_nographic, --=20 2.27.0