[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 04/10] qemu-options: Move -iscsi under "Block devi
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 04/10] qemu-options: Move -iscsi under "Block device options" |
Date: |
Wed, 20 Dec 2017 09:19:21 +0100 |
-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 <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Max Reitz <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Ronnie Sahlberg <address@hidden>
---
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
- [Qemu-devel] [PULL v2 00/10] Command line patches for 2017-12-18, Markus Armbruster, 2017/12/20
- [Qemu-devel] [PULL v2 02/10] qemu-options: Fix markup of -netdev l2tpv3, Markus Armbruster, 2017/12/20
- [Qemu-devel] [PULL v2 06/10] qemu-options: Polish section "TPM device options", Markus Armbruster, 2017/12/20
- [Qemu-devel] [PULL v2 10/10] option: Drop unused get_param_value(), get_next_param_value(), Markus Armbruster, 2017/12/20
- [Qemu-devel] [PULL v2 08/10] qemu-options: Belatedly document --watchdog-action inject-nmi, Markus Armbruster, 2017/12/20
- [Qemu-devel] [PULL v2 01/10] qemu-options: Remove stray colons from output of --help, Markus Armbruster, 2017/12/20
- [Qemu-devel] [PULL v2 07/10] qemu-options: Polish section "Character device options", Markus Armbruster, 2017/12/20
- [Qemu-devel] [PULL v2 04/10] qemu-options: Move -iscsi under "Block device options",
Markus Armbruster <=
- [Qemu-devel] [PULL v2 05/10] qemu-options: Add missing -iscsi Texinfo documentation, Markus Armbruster, 2017/12/20
- [Qemu-devel] [PULL v2 09/10] option: Remove shadowing opt decl from qemu_opt_print(), Markus Armbruster, 2017/12/20
- [Qemu-devel] [PULL v2 03/10] qemu-options qemu-doc: Move "Device URL Syntax" to qemu-doc, Markus Armbruster, 2017/12/20
- Re: [Qemu-devel] [PULL v2 00/10] Command line patches for 2017-12-18, Peter Maydell, 2017/12/20