From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRzQl-0004PQ-Se for qemu-devel@nongnu.org; Tue, 26 Jul 2016 06:17:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bRzQh-0001pv-Hz for qemu-devel@nongnu.org; Tue, 26 Jul 2016 06:17:42 -0400 Received: from mga04.intel.com ([192.55.52.120]:43153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRzQh-0001pp-C2 for qemu-devel@nongnu.org; Tue, 26 Jul 2016 06:17:39 -0400 From: Robert Ho Date: Tue, 26 Jul 2016 18:17:11 +0800 Message-Id: <1469528231-26206-1-git-send-email-robert.hu@intel.com> Subject: [Qemu-devel] [PATCH v2 1/1] Reorganize help output of '-display' option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: armbru@redhat.com, pbonzini@redhat.com Cc: qemu-devel@nongnu.org, Robert Ho 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. Changelog: v2: --fix typo of 'display' --change some discription words Signed-off-by: Robert Ho --- qemu-options.hx | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 17f15ad..ddeec72 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -930,10 +930,25 @@ 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" + "The default display is equivalent to\n" +#if defined(CONFIG_GTK) + "\t\"-display 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 +995,7 @@ the console and monitor. ETEXI DEF("curses", 0, QEMU_OPTION_curses, - "-curses use a curses/ncurses interface instead of SDL\n", + "-curses shorthand for -display curses\n", QEMU_ARCH_ALL) STEXI @item -curses @@ -1030,7 +1045,7 @@ Disable SDL window close capability. ETEXI DEF("sdl", 0, QEMU_OPTION_sdl, - "-sdl enable SDL\n", QEMU_ARCH_ALL) + "-sdl shorthand for -display sdl\n", QEMU_ARCH_ALL) STEXI @item -sdl @findex -sdl @@ -1227,7 +1242,7 @@ 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 shorthand for -display vnc=\n", QEMU_ARCH_ALL) STEXI @item -vnc @var{display}[,@var{option}[,@var{option}[,...]]] @findex -vnc -- 1.8.3.1