From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com>,
Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>,
qemu-block@nongnu.org
Subject: [Qemu-devel] [PULL v2 04/10] qemu-options: Move -iscsi under "Block device options"
Date: Wed, 20 Dec 2017 09:19:21 +0100 [thread overview]
Message-ID: <20171220081927.8761-5-armbru@redhat.com> (raw)
In-Reply-To: <20171220081927.8761-1-armbru@redhat.com>
-iscsi ended up under the "Device URL Syntax" heading by a sequence of
errors, as explained in the previous commit. Move it under the "Block
device options" heading. Nothing left under "Device URL Syntax";
drop the heading.
Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Max Reitz <mreitz@redhat.com>
Cc: qemu-block@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
---
qemu-options.hx | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 18b8211a21..3d05bcf557 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1182,6 +1182,13 @@ STEXI
Create synthetic file system image
ETEXI
+DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi,
+ "-iscsi [user=user][,password=password]\n"
+ " [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE\n"
+ " [,initiator-name=initiator-iqn][,id=target-iqn]\n"
+ " [,timeout=timeout]\n"
+ " iSCSI session parameters\n", QEMU_ARCH_ALL)
+
STEXI
@end table
ETEXI
@@ -2821,14 +2828,6 @@ STEXI
ETEXI
DEFHEADING()
-DEFHEADING(Device URL Syntax:)
-DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi,
- "-iscsi [user=user][,password=password]\n"
- " [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE\n"
- " [,initiator-name=initiator-iqn][,id=target-iqn]\n"
- " [,timeout=timeout]\n"
- " iSCSI session parameters\n", QEMU_ARCH_ALL)
-
DEFHEADING(Bluetooth(R) options:)
STEXI
@table @option
--
2.13.6
next prev parent reply other threads:[~2017-12-20 8:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-20 8:19 [Qemu-devel] [PULL v2 00/10] Command line patches for 2017-12-18 Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 01/10] qemu-options: Remove stray colons from output of --help Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 02/10] qemu-options: Fix markup of -netdev l2tpv3 Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 03/10] qemu-options qemu-doc: Move "Device URL Syntax" to qemu-doc Markus Armbruster
2017-12-20 8:19 ` Markus Armbruster [this message]
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 05/10] qemu-options: Add missing -iscsi Texinfo documentation Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 06/10] qemu-options: Polish section "TPM device options" Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 07/10] qemu-options: Polish section "Character " Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 08/10] qemu-options: Belatedly document --watchdog-action inject-nmi Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 09/10] option: Remove shadowing opt decl from qemu_opt_print() Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 10/10] option: Drop unused get_param_value(), get_next_param_value() Markus Armbruster
2017-12-20 15:26 ` [Qemu-devel] [PULL v2 00/10] Command line patches for 2017-12-18 Peter Maydell
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=20171220081927.8761-5-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=ronniesahlberg@gmail.com \
/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.