From nobody Tue Oct 28 14:13:44 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513620655439648.6842535219042; Mon, 18 Dec 2017 10:10:55 -0800 (PST) Received: from localhost ([::1]:60217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQzsC-0005tt-CX for importer@patchew.org; Mon, 18 Dec 2017 13:10:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQzFK-0002dI-WB for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:30:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQzFJ-0004hZ-OO for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:30:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53390) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eQzFC-0004Xn-K6; Mon, 18 Dec 2017 12:30:26 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0AF4C001CF3; Mon, 18 Dec 2017 17:30:25 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-74.ams2.redhat.com [10.36.116.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 708A17FB42; Mon, 18 Dec 2017 17:30:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EC03C113864E; Mon, 18 Dec 2017 18:30:23 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 18 Dec 2017 18:30:17 +0100 Message-Id: <20171218173023.21417-5-armbru@redhat.com> In-Reply-To: <20171218173023.21417-1-armbru@redhat.com> References: <20171218173023.21417-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 18 Dec 2017 17:30:25 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 04/10] qemu-options: Move -iscsi under "Block device options" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Ronnie Sahlberg , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" -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