aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2017-10-02 16:03:03 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-12-20 09:11:46 +0100
commit61d704870ab053c6405829b423b2d83f055a8488 (patch)
tree062c32e4810e0bac8aab3ce37cd9c24397aaa003
parente896d0f9ca6efb52ee44fbe890af43f23145e367 (diff)
qemu-options: Move -iscsi under "Block device options"
-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> Message-Id: <20171002140307.5292-5-armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
-rw-r--r--qemu-options.hx15
1 files changed, 7 insertions, 8 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index 4c50ed6f13..426abc83d8 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