From nobody Wed May 8 11:51:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571832250; cv=none; d=zoho.com; s=zohoarc; b=VbyJTxBRCrCkpTzx/IwdpThFilS+3/L4hKM3HCgzmx8IczykFvi/2doKnvcwzgYHF7rYi2t8duMJqcIwqzXPotrlSyXdBN3CbaPYVF9TSTFfAtyxpZ55SqVmzVQ8QqWWN18TCaQSOxTsXLjp8uZHC09wVRMJ9x0ORAPQ94SC5tc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571832250; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=pZk0MZLQdMzXbJMr9doDgj8waKfXrWSNV2vK14XQpRw=; b=lg982F/LPMkA6Ws79GKF1BF9UyOjZaisrrqPmHUPbpdw/W0IN7bHSp5qjxsTcLluEiPI0NuZNoZIr8VARNDMK2jZEAKJmi6LyXuLc5qgJj3TxCFrbQ7QNipOHkibelX5Jv2y52xXGKRSfp9nmrAST4cX7FkZBeV58GFOKUK9VeQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571832250423142.67581395172795; Wed, 23 Oct 2019 05:04:10 -0700 (PDT) Received: from localhost ([::1]:33850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNFN3-0001HC-2X for importer@patchew.org; Wed, 23 Oct 2019 08:04:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59154) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNFKb-0008OF-FG for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:01:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNFKa-0004Nk-1x for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:01:37 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:41782) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNFKZ-0004NM-S2 for qemu-devel@nongnu.org; Wed, 23 Oct 2019 08:01:36 -0400 Received: by mail-wr1-f45.google.com with SMTP id p4so21790375wrm.8 for ; Wed, 23 Oct 2019 05:01:35 -0700 (PDT) Received: from thl530.redhat.com (nat-pool-str-u.redhat.com. [149.14.88.107]) by smtp.gmail.com with ESMTPSA id p7sm19621115wma.34.2019.10.23.05.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 05:01:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pZk0MZLQdMzXbJMr9doDgj8waKfXrWSNV2vK14XQpRw=; b=je3a15RwBOn5qa0e2N/2JALpp3bm3z6YyNIEovfyswTtiENRkOJ3LGn4ODr7v2adbW aFVhhOhyNZdQUjO3jNZVGLl3v1zTM8M8zOnzkw2EEWbvt3amMA/o8Z13qzKbjQBLZxbU 4Gy54fl5mcqmEMrMLunoVBCmMvaK0EVg9UaPykMbpPpOOBmXOW/8LRrzEaFGzeuS0sqv DgeBVGewHBme7BpgqKp4+TAQ8L1wmoH2x8L2WuVAn9pcMeQyvDyHOYj/MVztYHO/XbZQ sx8p4ga8O8I2AA5gs9EOdA5SDJc5/iflBrdGqWaA1VOrBOs4ELounxFoftkJqUeWe9OI 09Dw== X-Gm-Message-State: APjAAAUvTSrIjGkkqjHKd8Y0VC+ZjMoKdzg/Rr9R3y3CW0Lwl+I9Q7N5 uOQ55rU4yREahS7pSEt4UPPXGuhE X-Google-Smtp-Source: APXvYqwDyLhvXFCGuPBTuAMYlGSte/svhmdQBz7xp6052u0Pm9N5yNbqS1MFnV8uuSaLfShZQYA4iQ== X-Received: by 2002:adf:ec0b:: with SMTP id x11mr7764858wrn.107.1571832093633; Wed, 23 Oct 2019 05:01:33 -0700 (PDT) From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PATCH] qemu-options: Rework the help text of the '-display' option Date: Wed, 23 Oct 2019 14:01:28 +0200 Message-Id: <20191023120129.13721-1-huth@tuxfamily.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.221.45 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: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Improve the help text of the "-display" option: - Only print the options that we have enabled in the binary (similar to what we do for other options like -netdev already) - The "frame=3Don|off" from "-display sdl" has been removed in commit 09bd7ba9f5f7 ("Remove deprecated -no-frame option"), so we should not show this in the help text anymore - The "-display egl-headless" line was missing a "\n" at the end - Indent the default display text in a nicer way Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qemu-options.hx | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 996b6fba74..917c54b302 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1526,26 +1526,38 @@ STEXI ETEXI =20 DEF("display", HAS_ARG, QEMU_OPTION_display, +#if defined(CONFIG_SPICE) "-display spice-app[,gl=3Don|off]\n" - "-display sdl[,frame=3Don|off][,alt_grab=3Don|off][,ctrl_grab=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" +#endif +#if defined(CONFIG_GTK) "-display gtk[,grab_on_hover=3Don|off][,gl=3Don|off]|\n" +#endif +#if defined(CONFIG_VNC) "-display vnc=3D[,]\n" +#endif +#if defined(CONFIG_CURSES) "-display curses[,charset=3D]\n" +#endif +#if defined(CONFIG_OPENGL) + "-display egl-headless[,rendernode=3D]\n" +#endif "-display none\n" - "-display egl-headless[,rendernode=3D]" - " select display type\n" - "The default display is equivalent to\n" + " select display backend type\n" + " The default display is equivalent to\n = " #if defined(CONFIG_GTK) - "\t\"-display gtk\"\n" + "\"-display gtk\"\n" #elif defined(CONFIG_SDL) - "\t\"-display sdl\"\n" + "\"-display sdl\"\n" #elif defined(CONFIG_COCOA) - "\t\"-display cocoa\"\n" + "\"-display cocoa\"\n" #elif defined(CONFIG_VNC) - "\t\"-vnc localhost:0,to=3D99,id=3Ddefault\"\n" + "\"-vnc localhost:0,to=3D99,id=3Ddefault\"\n" #else - "\t\"-display none\"\n" + "\"-display none\"\n" #endif , QEMU_ARCH_ALL) STEXI --=20 2.21.0