system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-10-04 18:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu-options: Improve the documentation of the -display options

Browse source 
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>
This commit is contained in:
Thomas Huth 2021-06-30 18:32:31 +02:00 committed by Paolo Bonzini
parent b6ddc6a2b2
commit 95f439bd11
1 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
qemu-options.hx
View file

@ -1783,11 +1783,12 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
"-display spice-app[,gl=on|off]\n" "-display spice-app[,gl=on|off]\n"
#endif #endif
#if defined(CONFIG_SDL) #if defined(CONFIG_SDL)
"-display sdl[,alt_grab=on|off][,ctrl_grab=on|off]\n" "-display sdl[,alt_grab=on|off][,ctrl_grab=on|off][,gl=on|core|es|off]\n"
" [,window-close=on|off][,gl=on|core|es|off]\n" " [,show-cursor=on|off][,window-close=on|off]\n"
#endif #endif
#if defined(CONFIG_GTK) #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 #endif
#if defined(CONFIG_VNC) #if defined(CONFIG_VNC)
"-display vnc=<display>[,<optargs>]\n" "-display vnc=<display>[,<optargs>]\n"
@ -1824,15 +1825,35 @@ SRST
application. The Spice server will redirect the serial consoles application. The Spice server will redirect the serial consoles
and QEMU monitors. (Since 4.0) 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 Display video output via SDL (usually in a separate graphics
window; see the SDL documentation for other possibilities). 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 Display video output in a GTK window. This interface provides
drop-down menus and other UI elements to configure and control drop-down menus and other UI elements to configure and control
the VM during runtime. the VM during runtime. Valid parameters are:
``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>]`` ``curses[,charset=<encoding>]``
Display video output via curses. For graphics device models Display video output via curses. For graphics device models
@ -1845,11 +1866,14 @@ SRST
``charset=CP850`` for IBM CP850 encoding. The default is ``charset=CP850`` for IBM CP850 encoding. The default is
``CP437``. ``CP437``.
``egl-headless[,rendernode<file>]`` ``egl-headless[,rendernode=<file>]``
Offload all OpenGL operations to a local DRI device. For any Offload all OpenGL operations to a local DRI device. For any
graphical display, this display needs to be paired with either graphical display, this display needs to be paired with either
VNC or SPICE displays. VNC or SPICE displays.
``vnc=<display>``
Start a VNC server on display <display>
``none`` ``none``
Do not display video output. The guest will still see an Do not display video output. The guest will still see an
emulated graphics card, but its output will not be displayed to 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 that it only affects what is done with video output; -nographic
also changes the destination of the serial and parallel port also changes the destination of the serial and parallel port
data. data.
ERST ERST
DEF("nographic", 0, QEMU_OPTION_nographic, DEF("nographic", 0, QEMU_OPTION_nographic,