From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRZbE-0001P9-J1 for qemu-devel@nongnu.org; Wed, 20 Dec 2017 03:19:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRZbD-0002e6-OG for qemu-devel@nongnu.org; Wed, 20 Dec 2017 03:19:36 -0500 From: Markus Armbruster Date: Wed, 20 Dec 2017 09:19:21 +0100 Message-Id: <20171220081927.8761-5-armbru@redhat.com> In-Reply-To: <20171220081927.8761-1-armbru@redhat.com> References: <20171220081927.8761-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 04/10] qemu-options: Move -iscsi under "Block device options" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Ronnie Sahlberg , Kevin Wolf , Max Reitz , qemu-block@nongnu.org -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 Cc: Kevin Wolf Cc: Max Reitz Cc: qemu-block@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Ronnie Sahlberg --- 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 =20 +DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi, + "-iscsi [user=3Duser][,password=3Dpassword]\n" + " [,header-digest=3DCRC32C|CR32C-NONE|NONE-CRC32C|NONE\n" + " [,initiator-name=3Dinitiator-iqn][,id=3Dtarget-iqn]\n" + " [,timeout=3Dtimeout]\n" + " iSCSI session parameters\n", QEMU_ARCH_ALL) + STEXI @end table ETEXI @@ -2821,14 +2828,6 @@ STEXI ETEXI DEFHEADING() =20 -DEFHEADING(Device URL Syntax:) -DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi, - "-iscsi [user=3Duser][,password=3Dpassword]\n" - " [,header-digest=3DCRC32C|CR32C-NONE|NONE-CRC32C|NONE\n" - " [,initiator-name=3Dinitiator-iqn][,id=3Dtarget-iqn]\n" - " [,timeout=3Dtimeout]\n" - " iSCSI session parameters\n", QEMU_ARCH_ALL) - DEFHEADING(Bluetooth(R) options:) STEXI @table @option --=20 2.13.6