All of lore.kernel.org
 help / color / mirror / Atom feed
From: Colin Lord <clord@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com, eblake@redhat.com,
	peter.maydell@linaro.org, Colin Lord <clord@redhat.com>
Subject: [Qemu-trivial] [PATCH v2] help: Update help to reflect that GTK is the default
Date: Fri,  5 Aug 2016 14:03:15 -0400	[thread overview]
Message-ID: <1470420195-32551-1-git-send-email-clord@redhat.com> (raw)

Updates the help messages to reflect that GTK is the default display (if
enabled), not SDL.

Signed-off-by: Colin Lord <clord@redhat.com>
---
 v2: Update to try to implement Paolo's suggested wordings. It looks to
 me like the subsections get wrapped at 72 lines, which mean there was a
 bit of a ripple effect and the changes look bigger than they are.
 qemu-options.hx | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index a71aaf8..657d083 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -982,13 +982,14 @@ DEF("nographic", 0, QEMU_OPTION_nographic,
 STEXI
 @item -nographic
 @findex -nographic
-Normally, QEMU uses SDL to display the VGA output. With this option,
-you can totally disable graphical output so that QEMU is a simple
-command line application. The emulated serial port is redirected on
-the console and muxed with the monitor (unless redirected elsewhere
-explicitly). Therefore, you can still use QEMU to debug a Linux kernel
-with a serial console.  Use @key{C-a h} for help on switching between
-the console and monitor.
+Normally, QEMU uses GTK or SDL to display the output (such as graphics,
+console, and the QEMU monitor). With this option, you can totally
+disable graphical output so that QEMU is a simple command line
+application. The emulated serial port is redirected on the console and
+muxed with the monitor (unless redirected elsewhere explicitly).
+Therefore, you can still use QEMU to debug a Linux kernel with a serial
+console. Use @key{C-a h} for help on switching between the console and
+monitor.
 ETEXI
 
 DEF("curses", 0, QEMU_OPTION_curses,
@@ -997,9 +998,10 @@ DEF("curses", 0, QEMU_OPTION_curses,
 STEXI
 @item -curses
 @findex -curses
-Normally, QEMU uses SDL to display the VGA output.  With this option,
-QEMU can display the VGA output when in text mode using a
-curses/ncurses interface.  Nothing is displayed in graphical mode.
+Normally, QEMU uses GTK or SDL to display the output (such as graphics,
+console, and the QEMU monitor). 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
 
 DEF("no-frame", 0, QEMU_OPTION_no_frame,
@@ -1243,13 +1245,13 @@ DEF("vnc", HAS_ARG, QEMU_OPTION_vnc ,
 STEXI
 @item -vnc @var{display}[,@var{option}[,@var{option}[,...]]]
 @findex -vnc
-Normally, QEMU uses SDL to display the VGA output.  With this option,
-you can have QEMU listen on VNC display @var{display} and redirect the VGA
-display over the VNC session.  It is very useful to enable the usb
-tablet device when using this option (option @option{-usbdevice
-tablet}). When using the VNC display, you 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
+Normally, QEMU uses GTK or SDL to display the output (such as graphics,
+console, and the QEMU monitor). With this option, you can have QEMU
+listen on VNC display @var{display} and redirect the VGA display over
+the VNC session. It is very useful to enable the usb tablet device when
+using this option (option @option{-usbdevice tablet}). When using the
+VNC display, you 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
 
-- 
2.5.5



WARNING: multiple messages have this Message-ID (diff)
From: Colin Lord <clord@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com, eblake@redhat.com,
	peter.maydell@linaro.org, Colin Lord <clord@redhat.com>
Subject: [Qemu-devel] [PATCH v2] help: Update help to reflect that GTK is the default
Date: Fri,  5 Aug 2016 14:03:15 -0400	[thread overview]
Message-ID: <1470420195-32551-1-git-send-email-clord@redhat.com> (raw)

Updates the help messages to reflect that GTK is the default display (if
enabled), not SDL.

Signed-off-by: Colin Lord <clord@redhat.com>
---
 v2: Update to try to implement Paolo's suggested wordings. It looks to
 me like the subsections get wrapped at 72 lines, which mean there was a
 bit of a ripple effect and the changes look bigger than they are.
 qemu-options.hx | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index a71aaf8..657d083 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -982,13 +982,14 @@ DEF("nographic", 0, QEMU_OPTION_nographic,
 STEXI
 @item -nographic
 @findex -nographic
-Normally, QEMU uses SDL to display the VGA output. With this option,
-you can totally disable graphical output so that QEMU is a simple
-command line application. The emulated serial port is redirected on
-the console and muxed with the monitor (unless redirected elsewhere
-explicitly). Therefore, you can still use QEMU to debug a Linux kernel
-with a serial console.  Use @key{C-a h} for help on switching between
-the console and monitor.
+Normally, QEMU uses GTK or SDL to display the output (such as graphics,
+console, and the QEMU monitor). With this option, you can totally
+disable graphical output so that QEMU is a simple command line
+application. The emulated serial port is redirected on the console and
+muxed with the monitor (unless redirected elsewhere explicitly).
+Therefore, you can still use QEMU to debug a Linux kernel with a serial
+console. Use @key{C-a h} for help on switching between the console and
+monitor.
 ETEXI
 
 DEF("curses", 0, QEMU_OPTION_curses,
@@ -997,9 +998,10 @@ DEF("curses", 0, QEMU_OPTION_curses,
 STEXI
 @item -curses
 @findex -curses
-Normally, QEMU uses SDL to display the VGA output.  With this option,
-QEMU can display the VGA output when in text mode using a
-curses/ncurses interface.  Nothing is displayed in graphical mode.
+Normally, QEMU uses GTK or SDL to display the output (such as graphics,
+console, and the QEMU monitor). 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
 
 DEF("no-frame", 0, QEMU_OPTION_no_frame,
@@ -1243,13 +1245,13 @@ DEF("vnc", HAS_ARG, QEMU_OPTION_vnc ,
 STEXI
 @item -vnc @var{display}[,@var{option}[,@var{option}[,...]]]
 @findex -vnc
-Normally, QEMU uses SDL to display the VGA output.  With this option,
-you can have QEMU listen on VNC display @var{display} and redirect the VGA
-display over the VNC session.  It is very useful to enable the usb
-tablet device when using this option (option @option{-usbdevice
-tablet}). When using the VNC display, you 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
+Normally, QEMU uses GTK or SDL to display the output (such as graphics,
+console, and the QEMU monitor). With this option, you can have QEMU
+listen on VNC display @var{display} and redirect the VGA display over
+the VNC session. It is very useful to enable the usb tablet device when
+using this option (option @option{-usbdevice tablet}). When using the
+VNC display, you 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
 
-- 
2.5.5

             reply	other threads:[~2016-08-05 18:03 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-05 18:03 Colin Lord [this message]
2016-08-05 18:03 ` [Qemu-devel] [PATCH v2] help: Update help to reflect that GTK is the default Colin Lord
2016-08-08  6:56 ` [Qemu-trivial] " Markus Armbruster
2016-08-08  6:56   ` Markus Armbruster
2016-08-12  8:42   ` [Qemu-trivial] " Paolo Bonzini
2016-08-12  8:42     ` Paolo Bonzini
2016-08-15  7:26     ` [Qemu-trivial] " Markus Armbruster
2016-08-15  7:26       ` Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1470420195-32551-1-git-send-email-clord@redhat.com \
    --to=clord@redhat.com \
    --cc=eblake@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.