From patchwork Sun Jul 17 02:49:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hu, Robert" X-Patchwork-Id: 649208 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rsW6F4XkYz9stc for ; Sun, 17 Jul 2016 12:51:21 +1000 (AEST) Received: from localhost ([::1]:39897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOcAR-0003UN-3f for incoming@patchwork.ozlabs.org; Sat, 16 Jul 2016 22:50:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOc9o-0002kn-RQ for qemu-devel@nongnu.org; Sat, 16 Jul 2016 22:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bOc9k-0002Is-Jy for qemu-devel@nongnu.org; Sat, 16 Jul 2016 22:50:15 -0400 Received: from mga02.intel.com ([134.134.136.20]:33457) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOc9k-0002Hj-BB for qemu-devel@nongnu.org; Sat, 16 Jul 2016 22:50:12 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP; 16 Jul 2016 19:50:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,376,1464678000"; d="scan'208";a="735369284" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.13.216]) by FMSMGA003.fm.intel.com with ESMTP; 16 Jul 2016 19:50:06 -0700 From: Robert Ho To: armbru@redhat.com, pbonzini@redhat.com Date: Sun, 17 Jul 2016 10:49:52 +0800 Message-Id: <1468723792-26714-1-git-send-email-robert.hu@intel.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH 1/1] Reorganize help output of '-display' 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: Robert Ho , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The '-display' help information is not very correct. This patch sort it a little. Also, in its help information, reveals what implicit display option will be chosen if no definition. P.S. Hi Markus, Sorry for late of sending out this patch. Really busy recently, and it also took me some time to understand the framework help message generation. Signed-off-by: Robert Ho --- qemu-options.hx | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 17f15ad..69cf668 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -930,10 +930,26 @@ ETEXI DEF("display", HAS_ARG, QEMU_OPTION_display, "-display sdl[,frame=on|off][,alt_grab=on|off][,ctrl_grab=on|off]\n" - " [,window_close=on|off]|curses|none|\n" - " gtk[,grab_on_hover=on|off]|\n" - " vnc=[,]\n" - " select display type\n", QEMU_ARCH_ALL) + " [,window_close=on|off][,gl=on|off]|curses|none|\n" + "-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n" + "-display vnc=[,]\n" + "-display curses\n" + "-display none" + " select display type\n" + "If no -display option or its sugars (sd, curses, vnc, etc) defined," + " qemu will implicitly use\n" +#if defined(CONFIG_GTK) + "\t\"-dispaly gtk\"\n" +#elif defined(CONFIG_SDL) + "\t\"-display sdl\"\n" +#elif defined(CONFIG_COCOA) + "\t\"-display cocoa\"\n" +#elif defined(CONFIG_VNC) + "\t\"-vnc localhost:0,to=99,id=default\"\n" +#else + "\t\"-display none\"\n" +#endif + , QEMU_ARCH_ALL) STEXI @item -display @var{type} @findex -display @@ -980,7 +996,8 @@ the console and monitor. ETEXI DEF("curses", 0, QEMU_OPTION_curses, - "-curses use a curses/ncurses interface instead of SDL\n", + "-curses use a curses/ncurses interface instead of SDL; " + "is sugar for -display curses\n", QEMU_ARCH_ALL) STEXI @item -curses @@ -1030,7 +1047,7 @@ Disable SDL window close capability. ETEXI DEF("sdl", 0, QEMU_OPTION_sdl, - "-sdl enable SDL\n", QEMU_ARCH_ALL) + "-sdl enable SDL; is sugar for -display sdl\n", QEMU_ARCH_ALL) STEXI @item -sdl @findex -sdl @@ -1227,7 +1244,8 @@ Set the initial graphical resolution and depth (PPC, SPARC only). ETEXI DEF("vnc", HAS_ARG, QEMU_OPTION_vnc , - "-vnc display start a VNC server on display\n", QEMU_ARCH_ALL) + "-vnc display start a VNC server on display; is sugar for" +" -display vnc=display\n", QEMU_ARCH_ALL) STEXI @item -vnc @var{display}[,@var{option}[,@var{option}[,...]]] @findex -vnc