From nobody Tue Feb 10 21:38:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@gnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@gnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506953374225424.13662819694855; Mon, 2 Oct 2017 07:09:34 -0700 (PDT) Received: from localhost ([::1]:52462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dz1PZ-0002WU-Fj for importer@patchew.org; Mon, 02 Oct 2017 10:09:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dz1Jh-0005p2-Bv for qemu-devel@nongnu.org; Mon, 02 Oct 2017 10:03:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dz1Jd-0004qV-Hj for qemu-devel@nongnu.org; Mon, 02 Oct 2017 10:03:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38928) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dz1JO-0004hv-3n; Mon, 02 Oct 2017 10:03:10 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 20CFC356DB; Mon, 2 Oct 2017 14:03:09 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-91.ams2.redhat.com [10.36.116.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE242183DC; Mon, 2 Oct 2017 14:03:08 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 609B3115626E; Mon, 2 Oct 2017 16:03:07 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 20CFC356DB Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=armbru@redhat.com From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 2 Oct 2017 16:03:03 +0200 Message-Id: <20171002140307.5292-5-armbru@redhat.com> In-Reply-To: <20171002140307.5292-1-armbru@redhat.com> References: <20171002140307.5292-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 02 Oct 2017 14:03:09 +0000 (UTC) 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] [PATCH 4/8] qemu-options: Move -iscsi under "Block device options" X-BeenThere: qemu-devel@gnu.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@gnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.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: Eric Blake 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 f112281d37..c647fdde62 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1172,6 +1172,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 @@ -2811,14 +2818,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