help: Update help to remove misleading display information

Updates the help messages to remove misleading information about SDL
being the normal display used.

Signed-off-by: Colin Lord <cdlord2@illinois.edu>
Message-Id: <1471030248-21637-1-git-send-email-cdlord2@illinois.edu>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Colin Lord 2016-08-12 15:30:48 -04:00 committed by Paolo Bonzini
parent d90f3cca87
commit dc0a3e448c
1 changed files with 21 additions and 17 deletions

View File

@ -982,13 +982,14 @@ DEF("nographic", 0, QEMU_OPTION_nographic,
STEXI STEXI
@item -nographic @item -nographic
@findex -nographic @findex -nographic
Normally, QEMU uses SDL to display the VGA output. With this option, Normally, if QEMU is compiled with graphical window support, it displays
you can totally disable graphical output so that QEMU is a simple output such as guest graphics, guest console, and the QEMU monitor in a
command line application. The emulated serial port is redirected on window. With this option, you can totally disable graphical output so
the console and muxed with the monitor (unless redirected elsewhere that QEMU is a simple command line application. The emulated serial port
explicitly). Therefore, you can still use QEMU to debug a Linux kernel is redirected on the console and muxed with the monitor (unless
with a serial console. Use @key{C-a h} for help on switching between redirected elsewhere explicitly). Therefore, you can still use QEMU to
the console and monitor. debug a Linux kernel with a serial console. Use @key{C-a h} for help on
switching between the console and monitor.
ETEXI ETEXI
DEF("curses", 0, QEMU_OPTION_curses, DEF("curses", 0, QEMU_OPTION_curses,
@ -997,9 +998,11 @@ DEF("curses", 0, QEMU_OPTION_curses,
STEXI STEXI
@item -curses @item -curses
@findex -curses @findex -curses
Normally, QEMU uses SDL to display the VGA output. With this option, Normally, if QEMU is compiled with graphical window support, it displays
QEMU can display the VGA output when in text mode using a output such as guest graphics, guest console, and the QEMU monitor in a
curses/ncurses interface. Nothing is displayed in graphical mode. window. With this option, QEMU can display the VGA output when in text
mode using a curses/ncurses interface. Nothing is displayed in graphical
mode.
ETEXI ETEXI
DEF("no-frame", 0, QEMU_OPTION_no_frame, DEF("no-frame", 0, QEMU_OPTION_no_frame,
@ -1243,13 +1246,14 @@ DEF("vnc", HAS_ARG, QEMU_OPTION_vnc ,
STEXI STEXI
@item -vnc @var{display}[,@var{option}[,@var{option}[,...]]] @item -vnc @var{display}[,@var{option}[,@var{option}[,...]]]
@findex -vnc @findex -vnc
Normally, QEMU uses SDL to display the VGA output. With this option, Normally, if QEMU is compiled with graphical window support, it displays
you can have QEMU listen on VNC display @var{display} and redirect the VGA output such as guest graphics, guest console, and the QEMU monitor in a
display over the VNC session. It is very useful to enable the usb window. With this option, you can have QEMU listen on VNC display
tablet device when using this option (option @option{-usbdevice @var{display} and redirect the VGA display over the VNC session. It is
tablet}). When using the VNC display, you must use the @option{-k} very useful to enable the usb tablet device when using this option
parameter to set the keyboard layout if you are not using en-us. Valid (option @option{-usbdevice tablet}). When using the VNC display, you
syntax for the @var{display} is must use the @option{-k} parameter to set the keyboard layout if you are
not using en-us. Valid syntax for the @var{display} is
@table @option @table @option