[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/40] qemu-options: Improve the documentation of the -display opt
From: |
Paolo Bonzini |
Subject: |
[PULL 05/40] qemu-options: Improve the documentation of the -display options |
Date: |
Tue, 6 Jul 2021 12:01:06 +0200 |
From: Thomas Huth <thuth@redhat.com>
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 <thuth@redhat.com>
Message-Id: <20210630163231.467987-5-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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=on|off]\n"
#endif
#if defined(CONFIG_SDL)
- "-display sdl[,alt_grab=on|off][,ctrl_grab=on|off]\n"
- " [,window-close=on|off][,gl=on|core|es|off]\n"
+ "-display sdl[,alt_grab=on|off][,ctrl_grab=on|off][,gl=on|core|es|off]\n"
+ " [,show-cursor=on|off][,window-close=on|off]\n"
#endif
#if defined(CONFIG_GTK)
- "-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n"
+ "-display gtk[,full-screen=on|off][,gl=on|off][,grab-on-hover=on|off]\n"
+ " [,show-cursor=on|off][,window-close=on|off]\n"
#endif
#if defined(CONFIG_VNC)
"-display vnc=<display>[,<optargs>]\n"
@@ -1824,17 +1825,37 @@ SRST
application. The Spice server will redirect the serial consoles
and QEMU monitors. (Since 4.0)
- ``sdl[,window-close=on|off][,gl=on|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:
- ``gtk[,grab-on-hover=on|off][,gl=on|off]``
+ ``alt_grab=on|off`` : Use Control+Alt+Shift-g to toggle mouse grabbing
+
+ ``ctrl_grab=on|off`` : Use Right-Control-g to toggle mouse grabbing
+
+ ``gl=on|off|core|es`` : Use OpenGL for displaying
+
+ ``show-cursor=on|off`` : Force showing the mouse cursor
+
+ ``window-close=on|off`` : Allow to quit qemu with window close button
+
+ ``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:
- ``curses [,charset=<encoding>]``
+ ``full-screen=on|off`` : Start in fullscreen mode
+
+ ``gl=on|off`` : Use OpenGL for displaying
+
+ ``grab-on-hover=on|off`` : Grab keyboard input on mouse hover
+
+ ``show-cursor=on|off`` : Force showing the mouse cursor
+
+ ``window-close=on|off`` : Allow to quit qemu with window close button
+
+ ``curses[,charset=<encoding>]``
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=CP850`` for IBM CP850 encoding. The default is
``CP437``.
- ``egl-headless[,rendernode<file>]``
+ ``egl-headless[,rendernode=<file>]``
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.
+ ``vnc=<display>``
+ Start a VNC server on display <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
DEF("nographic", 0, QEMU_OPTION_nographic,
--
2.31.1
- [PULL 00/40] Misc patches for 2021-07-06, Paolo Bonzini, 2021/07/06
- [PULL 04/40] ui: Mark the '-no-quit' option as deprecated, Paolo Bonzini, 2021/07/06
- [PULL 03/40] ui: Fix the "-display sdl,window_close=..." parameter, Paolo Bonzini, 2021/07/06
- [PULL 02/40] softmmu/vl: Remove obsolete comment about the "frame" parameter, Paolo Bonzini, 2021/07/06
- [PULL 05/40] qemu-options: Improve the documentation of the -display options,
Paolo Bonzini <=
- [PULL 07/40] coverity-scan: switch to vpath build, Paolo Bonzini, 2021/07/06
- [PULL 06/40] coverity-scan: Remove lm32 / unicore32 targets, Paolo Bonzini, 2021/07/06
- [PULL 10/40] target/i386: Clarify the padding requirements of X86XSaveArea, Paolo Bonzini, 2021/07/06
- [PULL 11/40] target/i386: Pass buffer and length to XSAVE helper, Paolo Bonzini, 2021/07/06
- [PULL 12/40] target/i386: Make x86_ext_save_areas visible outside cpu.c, Paolo Bonzini, 2021/07/06
- [PULL 09/40] target/i386: Consolidate the X86XSaveArea offset checks, Paolo Bonzini, 2021/07/06
- [PULL 13/40] target/i386: Observe XSAVE state area offsets, Paolo Bonzini, 2021/07/06
- [PULL 08/40] target/i386: Declare constants for XSAVE offsets, Paolo Bonzini, 2021/07/06
- [PULL 17/40] configure, meson: convert vte detection to meson, Paolo Bonzini, 2021/07/06
- [PULL 18/40] configure, meson: convert virgl detection to meson, Paolo Bonzini, 2021/07/06