From nobody Fri May 17 08:39:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643649419772700.7603978485266; Mon, 31 Jan 2022 09:16:59 -0800 (PST) Received: from localhost ([::1]:53926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEaIV-0007cu-3W for importer@patchew.org; Mon, 31 Jan 2022 12:16:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEa6e-0001Nt-EJ for qemu-devel@nongnu.org; Mon, 31 Jan 2022 12:04:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:24286) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEa6Z-0007QI-VI for qemu-devel@nongnu.org; Mon, 31 Jan 2022 12:04:42 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-145-lwqcLxy3OC-IrDFwWFq-SA-1; Mon, 31 Jan 2022 12:04:35 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C18DD85C872; Mon, 31 Jan 2022 17:04:20 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.193.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1EEF10A48D5; Mon, 31 Jan 2022 17:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643648676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hx721CCZS3t1vuJ4TwbDK1CG8hVugJZUacHYTAHQm8I=; b=FgYU5goY51JWIag+oOF6nEhj4eaiUJmxZTbZGNAnXvlieqFZFb5wqhl7XoLIRDW1I1eDSj dZFkL1KoSaiUlg0NSMMUn2efwlTYZ10PpUjEWnmqeorGWCAaqChK5U1J1ttKCjhBxVeHGX EqKtGaV4Vr2SL3vrIB/BY6NOcM3Md/0= X-MC-Unique: lwqcLxy3OC-IrDFwWFq-SA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 1/5] docs: Pass disabled configure options to sphinx Date: Mon, 31 Jan 2022 18:04:07 +0100 Message-Id: <20220131170411.125198-2-kwolf@redhat.com> In-Reply-To: <20220131170411.125198-1-kwolf@redhat.com> References: <20220131170411.125198-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, timao@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643649421518100001 Content-Type: text/plain; charset="utf-8" Man pages and other documentation should only contain things that are actually available in this build. In order to conditionally build documentation depending on the build configuration, pass the configuration to sphinx as tags. The tags are negative so that building documentation from outside of meson (in particular for things like readthedocs) without any tags set results in the full documentation rather than disabling everything that is optional. Signed-off-by: Kevin Wolf --- docs/meson.build | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/meson.build b/docs/meson.build index 57b28a3146..3220da4c15 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -37,6 +37,16 @@ endif if build_docs SPHINX_ARGS +=3D ['-Dversion=3D' + meson.project_version(), '-Drelease= =3D' + config_host['PKGVERSION']] =20 + foreach key: config_host_data.keys() + if not key.startswith('CONFIG_') + continue + endif + if '@0@'.format(config_host_data.get(key)) in ['0', 'false'] + tag =3D 'DISABLE_' + key.substring(7) + SPHINX_ARGS +=3D ['-t', tag] + endif + endforeach + have_ga =3D have_tools and config_host.has_key('CONFIG_GUEST_AGENT') =20 man_pages =3D { --=20 2.31.1 From nobody Fri May 17 08:39:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643650118366955.7580822512465; Mon, 31 Jan 2022 09:28:38 -0800 (PST) Received: from localhost ([::1]:36170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEaTl-0006qF-0I for importer@patchew.org; Mon, 31 Jan 2022 12:28:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEa6e-0001Nw-UD for qemu-devel@nongnu.org; Mon, 31 Jan 2022 12:04:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:20129) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEa6a-0007Qe-5s for qemu-devel@nongnu.org; Mon, 31 Jan 2022 12:04:43 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-527-vV0ItUzdOSiwwhZNKgdHmA-1; Mon, 31 Jan 2022 12:04:38 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3649F1124C64; Mon, 31 Jan 2022 17:04:22 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.193.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17EBE10A48D5; Mon, 31 Jan 2022 17:04:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643648679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AjRoL5UfHDemeFhbzG7hZg3xYEjOqguiS98C3iU897g=; b=T9OlSj2vLzDsaW51deq0U/9exK++KMhGiydM3rh0awydRNkxVKP3NCs82DIlPu4C5pNb/o KfTIY466vqsMlw6ENq5O8it1PLIhrajGVN56zZLT75iYhwOQ8uelZMo18DeiAjPAOFU+fY u0CTujUvd8dlxDBpSj1myB2E6WRDXaQ= X-MC-Unique: vV0ItUzdOSiwwhZNKgdHmA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 2/5] docs: Only mention iscsi in the man page when available Date: Mon, 31 Jan 2022 18:04:08 +0100 Message-Id: <20220131170411.125198-3-kwolf@redhat.com> In-Reply-To: <20220131170411.125198-1-kwolf@redhat.com> References: <20220131170411.125198-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, timao@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643650121278100001 Content-Type: text/plain; charset="utf-8" If libiscsi is disabled in the build, the man page shouldn't contain information on how to construct iscsi URLs etc. This patch is best viewed with whitespace changes ignored. Signed-off-by: Kevin Wolf --- docs/system/device-url-syntax.rst.inc | 60 ++++++++++++++------------- qemu-options.hx | 9 ++-- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/docs/system/device-url-syntax.rst.inc b/docs/system/device-url= -syntax.rst.inc index 7dbc525fa8..c882bce418 100644 --- a/docs/system/device-url-syntax.rst.inc +++ b/docs/system/device-url-syntax.rst.inc @@ -1,47 +1,49 @@ =20 In addition to using normal file images for the emulated storage -devices, QEMU can also use networked resources such as iSCSI devices. -These are specified using a special URL syntax. +devices, QEMU can also use networked resources. These are specified using a +special URL syntax. =20 -``iSCSI`` - iSCSI support allows QEMU to access iSCSI resources directly and use - as images for the guest storage. Both disk and cdrom images are - supported. +.. only:: not DISABLE_LIBISCSI =20 - Syntax for specifying iSCSI LUNs is - "iscsi://[:]//" + ``iSCSI`` + iSCSI support allows QEMU to access iSCSI resources directly and use + as images for the guest storage. Both disk and cdrom images are + supported. =20 - By default qemu will use the iSCSI initiator-name - 'iqn.2008-11.org.linux-kvm[:]' but this can also be set from - the command line or a configuration file. + Syntax for specifying iSCSI LUNs is + "iscsi://[:]//" =20 - Since version QEMU 2.4 it is possible to specify a iSCSI request - timeout to detect stalled requests and force a reestablishment of the - session. The timeout is specified in seconds. The default is 0 which - means no timeout. Libiscsi 1.15.0 or greater is required for this - feature. + By default qemu will use the iSCSI initiator-name + 'iqn.2008-11.org.linux-kvm[:]' but this can also be set from + the command line or a configuration file. =20 - Example (without authentication): + Since version QEMU 2.4 it is possible to specify a iSCSI request + timeout to detect stalled requests and force a reestablishment of t= he + session. The timeout is specified in seconds. The default is 0 which + means no timeout. Libiscsi 1.15.0 or greater is required for this + feature. =20 - .. parsed-literal:: + Example (without authentication): =20 - |qemu_system| -iscsi initiator-name=3Diqn.2001-04.com.example:my-ini= tiator \\ - -cdrom iscsi://192.0.2.1/iqn.2001-04.com.example/2 = \\ - -drive file=3Discsi://192.0.2.1/iqn.2001-04.com.exa= mple/1 + .. parsed-literal:: =20 - Example (CHAP username/password via URL): + |qemu_system| -iscsi initiator-name=3Diqn.2001-04.com.example:my= -initiator \\ + -cdrom iscsi://192.0.2.1/iqn.2001-04.com.exampl= e/2 \\ + -drive file=3Discsi://192.0.2.1/iqn.2001-04.com= .example/1 =20 - .. parsed-literal:: + Example (CHAP username/password via URL): =20 - |qemu_system| -drive file=3Discsi://user%password@192.0.2.1/iqn.2001= -04.com.example/1 + .. parsed-literal:: =20 - Example (CHAP username/password via environment variables): + |qemu_system| -drive file=3Discsi://user%password@192.0.2.1/iqn.= 2001-04.com.example/1 =20 - .. parsed-literal:: + Example (CHAP username/password via environment variables): + + .. parsed-literal:: =20 - LIBISCSI_CHAP_USERNAME=3D"user" \\ - LIBISCSI_CHAP_PASSWORD=3D"password" \\ - |qemu_system| -drive file=3Discsi://192.0.2.1/iqn.2001-04.com.exampl= e/1 + LIBISCSI_CHAP_USERNAME=3D"user" \\ + LIBISCSI_CHAP_PASSWORD=3D"password" \\ + |qemu_system| -drive file=3Discsi://192.0.2.1/iqn.2001-04.com.ex= ample/1 =20 ``NBD`` QEMU supports NBD (Network Block Devices) both using TCP protocol as diff --git a/qemu-options.hx b/qemu-options.hx index ba3ae6a42a..4d3721f1ea 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1363,7 +1363,7 @@ SRST If the filename contains comma, you must double it (for instance, "file=3Dmy,,file" to use file "my,file"). =20 - Special files such as iSCSI devices can be specified using + Special files such as for network protocols can be specified using protocol specific URLs. See the section for "Device URL Syntax" for more information. =20 @@ -1831,8 +1831,11 @@ DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi, " iSCSI session parameters\n", QEMU_ARCH_ALL) =20 SRST -``-iscsi`` - Configure iSCSI session parameters. + +.. only:: not DISABLE_LIBISCSI + + ``-iscsi`` + Configure iSCSI session parameters. ERST =20 DEFHEADING() --=20 2.31.1 From nobody Fri May 17 08:39:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643649154019378.78310229327576; Mon, 31 Jan 2022 09:12:34 -0800 (PST) Received: from localhost ([::1]:46264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEaED-0002BW-60 for importer@patchew.org; Mon, 31 Jan 2022 12:12:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEa6g-0001Uj-Ho for qemu-devel@nongnu.org; Mon, 31 Jan 2022 12:04:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEa6e-0007Rr-P1 for qemu-devel@nongnu.org; Mon, 31 Jan 2022 12:04:46 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-199-cJgcu5JLPUenijQs9zkQ7g-1; Mon, 31 Jan 2022 12:04:36 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 497C18144E9; Mon, 31 Jan 2022 17:04:31 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.193.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8092610A48D5; Mon, 31 Jan 2022 17:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643648684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1AdQxXYwk5AHMGM0F/kmPdGc3RiSlXfSLnXvYCVVMcQ=; b=SkB6HjeKiBDe84C92Nh+pn8UAHDTOFQZ/4c+Hu+yBeEjB82nu04hRXSgspLNGuLYdOnUUl 43ZNSG3pguUKma7913AUhq9tuObI3F/YqZ2QP861WR6Wla+ml201hY81GoMP1PCp8iGzrd XIcdhM6jVl1e6AxJ0dD7SOQWt9qa+sk= X-MC-Unique: cJgcu5JLPUenijQs9zkQ7g-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 3/5] docs: Only mention ssh in the man page when available Date: Mon, 31 Jan 2022 18:04:09 +0100 Message-Id: <20220131170411.125198-4-kwolf@redhat.com> In-Reply-To: <20220131170411.125198-1-kwolf@redhat.com> References: <20220131170411.125198-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, timao@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643649157377100001 Content-Type: text/plain; charset="utf-8" If libssh is disabled in the build, the man page shouldn't contain information on how to use the ssh block driver. This patch is best viewed with whitespace changes ignored. Signed-off-by: Kevin Wolf --- docs/system/device-url-syntax.rst.inc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/system/device-url-syntax.rst.inc b/docs/system/device-url= -syntax.rst.inc index c882bce418..84a8145292 100644 --- a/docs/system/device-url-syntax.rst.inc +++ b/docs/system/device-url-syntax.rst.inc @@ -74,18 +74,20 @@ special URL syntax. =20 |qemu_system| --drive file=3Dnbd:unix:/tmp/nbd-socket =20 -``SSH`` - QEMU supports SSH (Secure Shell) access to remote disks. +.. only:: not DISABLE_LIBSSH =20 - Examples: + ``SSH`` + QEMU supports SSH (Secure Shell) access to remote disks. =20 - .. parsed-literal:: + Examples: + + .. parsed-literal:: =20 - |qemu_system| -drive file=3Dssh://user@host/path/to/disk.img - |qemu_system| -drive file.driver=3Dssh,file.user=3Duser,file.host=3D= host,file.port=3D22,file.path=3D/path/to/disk.img + |qemu_system| -drive file=3Dssh://user@host/path/to/disk.img + |qemu_system| -drive file.driver=3Dssh,file.user=3Duser,file.hos= t=3Dhost,file.port=3D22,file.path=3D/path/to/disk.img =20 - Currently authentication must be done using ssh-agent. Other - authentication methods may be supported in future. + Currently authentication must be done using ssh-agent. Other + authentication methods may be supported in future. =20 ``GlusterFS`` GlusterFS is a user space distributed file system. QEMU supports the --=20 2.31.1 From nobody Fri May 17 08:39:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164364906713177.45176942244962; Mon, 31 Jan 2022 09:11:07 -0800 (PST) Received: from localhost ([::1]:42542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEaCo-00086H-3k for importer@patchew.org; Mon, 31 Jan 2022 12:11:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEa6k-0001gW-Ve for qemu-devel@nongnu.org; Mon, 31 Jan 2022 12:04:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:25116) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEa6i-0007Si-Ow for qemu-devel@nongnu.org; Mon, 31 Jan 2022 12:04:50 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-618-sBi0eKICMGOi1IJjhmaTsQ-1; Mon, 31 Jan 2022 12:04:40 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BF85A100C672; Mon, 31 Jan 2022 17:04:37 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.193.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 936A210A48D5; Mon, 31 Jan 2022 17:04:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643648688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MKdf8yOehZE/jWOSlPC4m+igdOOgUTO7o0AQoQ84QBM=; b=CV4rtbf3JE/HGtxhAozMhZd85cCoVOZE0kRhrCqBf8Y56SLf/IoHQINu8jqmejuldcsmwG JWRRqELjYUk0gjqpIRY57G8NtJrlh+XtzC9azxYcW+jRwW++c05fv5/QuI2CN8ShrnUd7V bg6AGXkCKoctlwUWxWD5D2D6+O/fpZs= X-MC-Unique: sBi0eKICMGOi1IJjhmaTsQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 4/5] docs: Only mention curl in the man page when available Date: Mon, 31 Jan 2022 18:04:10 +0100 Message-Id: <20220131170411.125198-5-kwolf@redhat.com> In-Reply-To: <20220131170411.125198-1-kwolf@redhat.com> References: <20220131170411.125198-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, timao@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643649068915100001 Content-Type: text/plain; charset="utf-8" If curl is disabled in the build, the man page shouldn't contain information on how to use the curl block drivers. This patch is best viewed with whitespace changes ignored. Signed-off-by: Kevin Wolf --- docs/system/device-url-syntax.rst.inc | 114 +++++++++++++------------- 1 file changed, 58 insertions(+), 56 deletions(-) diff --git a/docs/system/device-url-syntax.rst.inc b/docs/system/device-url= -syntax.rst.inc index 84a8145292..d55622847a 100644 --- a/docs/system/device-url-syntax.rst.inc +++ b/docs/system/device-url-syntax.rst.inc @@ -128,87 +128,89 @@ special URL syntax. =20 See also http://www.gluster.org. =20 -``HTTP/HTTPS/FTP/FTPS`` - QEMU supports read-only access to files accessed over http(s) and - ftp(s). +.. only:: not DISABLE_CURL =20 - Syntax using a single filename: + ``HTTP/HTTPS/FTP/FTPS`` + QEMU supports read-only access to files accessed over http(s) and + ftp(s). =20 - :: + Syntax using a single filename: =20 - ://[[:]@]/ + :: =20 - where: + ://[[:]@]/ =20 - ``protocol`` - 'http', 'https', 'ftp', or 'ftps'. + where: =20 - ``username`` - Optional username for authentication to the remote server. + ``protocol`` + 'http', 'https', 'ftp', or 'ftps'. =20 - ``password`` - Optional password for authentication to the remote server. + ``username`` + Optional username for authentication to the remote server. =20 - ``host`` - Address of the remote server. + ``password`` + Optional password for authentication to the remote server. =20 - ``path`` - Path on the remote server, including any query string. + ``host`` + Address of the remote server. =20 - The following options are also supported: + ``path`` + Path on the remote server, including any query string. =20 - ``url`` - The full URL when passing options to the driver explicitly. + The following options are also supported: =20 - ``readahead`` - The amount of data to read ahead with each range request to the - remote server. This value may optionally have the suffix 'T', 'G', - 'M', 'K', 'k' or 'b'. If it does not have a suffix, it will be - assumed to be in bytes. The value must be a multiple of 512 bytes. - It defaults to 256k. + ``url`` + The full URL when passing options to the driver explicitly. =20 - ``sslverify`` - Whether to verify the remote server's certificate when connecting - over SSL. It can have the value 'on' or 'off'. It defaults to - 'on'. + ``readahead`` + The amount of data to read ahead with each range request to the + remote server. This value may optionally have the suffix 'T', 'G= ', + 'M', 'K', 'k' or 'b'. If it does not have a suffix, it will be + assumed to be in bytes. The value must be a multiple of 512 byte= s. + It defaults to 256k. =20 - ``cookie`` - Send this cookie (it can also be a list of cookies separated by - ';') with each outgoing request. Only supported when using - protocols such as HTTP which support cookies, otherwise ignored. + ``sslverify`` + Whether to verify the remote server's certificate when connecting + over SSL. It can have the value 'on' or 'off'. It defaults to + 'on'. =20 - ``timeout`` - Set the timeout in seconds of the CURL connection. This timeout is - the time that CURL waits for a response from the remote server to - get the size of the image to be downloaded. If not set, the - default timeout of 5 seconds is used. + ``cookie`` + Send this cookie (it can also be a list of cookies separated by + ';') with each outgoing request. Only supported when using + protocols such as HTTP which support cookies, otherwise ignored. =20 - Note that when passing options to qemu explicitly, ``driver`` is the - value of . + ``timeout`` + Set the timeout in seconds of the CURL connection. This timeout = is + the time that CURL waits for a response from the remote server to + get the size of the image to be downloaded. If not set, the + default timeout of 5 seconds is used. =20 - Example: boot from a remote Fedora 20 live ISO image + Note that when passing options to qemu explicitly, ``driver`` is the + value of . =20 - .. parsed-literal:: + Example: boot from a remote Fedora 20 live ISO image =20 - |qemu_system_x86| --drive media=3Dcdrom,file=3Dhttps://archives.fedo= raproject.org/pub/archive/fedora/linux/releases/20/Live/x86_64/Fedora-Live-= Desktop-x86_64-20-1.iso,readonly + .. parsed-literal:: =20 - |qemu_system_x86| --drive media=3Dcdrom,file.driver=3Dhttp,file.url= =3Dhttp://archives.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_= 64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly + |qemu_system_x86| --drive media=3Dcdrom,file=3Dhttps://archives.= fedoraproject.org/pub/archive/fedora/linux/releases/20/Live/x86_64/Fedora-L= ive-Desktop-x86_64-20-1.iso,readonly =20 - Example: boot from a remote Fedora 20 cloud image using a local - overlay for writes, copy-on-read, and a readahead of 64k + |qemu_system_x86| --drive media=3Dcdrom,file.driver=3Dhttp,file.= url=3Dhttp://archives.fedoraproject.org/pub/fedora/linux/releases/20/Live/x= 86_64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly =20 - .. parsed-literal:: + Example: boot from a remote Fedora 20 cloud image using a local + overlay for writes, copy-on-read, and a readahead of 64k =20 - qemu-img create -f qcow2 -o backing_file=3D'json:{"file.driver":"htt= p",, "file.url":"http://archives.fedoraproject.org/pub/archive/fedora/linux= /releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2",, "file.r= eadahead":"64k"}' /tmp/Fedora-x86_64-20-20131211.1-sda.qcow2 + .. parsed-literal:: =20 - |qemu_system_x86| -drive file=3D/tmp/Fedora-x86_64-20-20131211.1-sda= .qcow2,copy-on-read=3Don + qemu-img create -f qcow2 -o backing_file=3D'json:{"file.driver":= "http",, "file.url":"http://archives.fedoraproject.org/pub/archive/fedora/l= inux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2",, "fi= le.readahead":"64k"}' /tmp/Fedora-x86_64-20-20131211.1-sda.qcow2 =20 - Example: boot from an image stored on a VMware vSphere server with a - self-signed certificate using a local overlay for writes, a readahead - of 64k and a timeout of 10 seconds. + |qemu_system_x86| -drive file=3D/tmp/Fedora-x86_64-20-20131211.1= -sda.qcow2,copy-on-read=3Don =20 - .. parsed-literal:: + Example: boot from an image stored on a VMware vSphere server with a + self-signed certificate using a local overlay for writes, a readahe= ad + of 64k and a timeout of 10 seconds. + + .. parsed-literal:: =20 - qemu-img create -f qcow2 -o backing_file=3D'json:{"file.driver":"htt= ps",, "file.url":"https://user:password@vsphere.example.com/folder/test/tes= t-flat.vmdk?dcPath=3DDatacenter&dsName=3Ddatastore1",, "file.sslverify":"of= f",, "file.readahead":"64k",, "file.timeout":10}' /tmp/test.qcow2 + qemu-img create -f qcow2 -o backing_file=3D'json:{"file.driver":= "https",, "file.url":"https://user:password@vsphere.example.com/folder/test= /test-flat.vmdk?dcPath=3DDatacenter&dsName=3Ddatastore1",, "file.sslverify"= :"off",, "file.readahead":"64k",, "file.timeout":10}' /tmp/test.qcow2 =20 - |qemu_system_x86| -drive file=3D/tmp/test.qcow2 + |qemu_system_x86| -drive file=3D/tmp/test.qcow2 --=20 2.31.1 From nobody Fri May 17 08:39:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643649404803693.4166026017756; Mon, 31 Jan 2022 09:16:44 -0800 (PST) Received: from localhost ([::1]:52948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEaIF-0006z1-KE for importer@patchew.org; Mon, 31 Jan 2022 12:16:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEa6i-0001Xr-CB for qemu-devel@nongnu.org; Mon, 31 Jan 2022 12:04:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:60824) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEa6f-0007S5-Ju for qemu-devel@nongnu.org; Mon, 31 Jan 2022 12:04:47 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-202-6g8QVN8TOr-nn05Cb0D7VQ-1; Mon, 31 Jan 2022 12:04:41 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3DC871091DA2; Mon, 31 Jan 2022 17:04:39 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.193.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1535510A48D5; Mon, 31 Jan 2022 17:04:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643648684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XV71P2sLnR/qPqyPAEYdGjxWcG9soMr4fWGGZbFMakM=; b=dRwyNpEIXUIyAV4FbpTdJ1rkhEtmir7FgsQX7PGpfuS1a3HpHLSzQPP6wmBcFS2i4O5AaX rr8AaA7vwg8DLCCGys5HzTaeER1onEBcoRUrwKN1skZb/ySA/VUx88LtmxakX4lplFNb3E jXjl6i45nIlGmzN2F/iFucK1NKAbbrI= X-MC-Unique: 6g8QVN8TOr-nn05Cb0D7VQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 5/5] docs: Only mention gluster in the man page when available Date: Mon, 31 Jan 2022 18:04:11 +0100 Message-Id: <20220131170411.125198-6-kwolf@redhat.com> In-Reply-To: <20220131170411.125198-1-kwolf@redhat.com> References: <20220131170411.125198-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, timao@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643649407335100001 If gluster is disabled in the build, the man page shouldn't contain information on how to use the gluster block driver. This patch is best viewed with whitespace changes ignored. Signed-off-by: Kevin Wolf --- docs/system/device-url-syntax.rst.inc | 64 ++++++++++++++------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/docs/system/device-url-syntax.rst.inc b/docs/system/device-url= -syntax.rst.inc index d55622847a..79270c8709 100644 --- a/docs/system/device-url-syntax.rst.inc +++ b/docs/system/device-url-syntax.rst.inc @@ -89,44 +89,46 @@ special URL syntax. Currently authentication must be done using ssh-agent. Other authentication methods may be supported in future. =20 -``GlusterFS`` - GlusterFS is a user space distributed file system. QEMU supports the - use of GlusterFS volumes for hosting VM disk images using TCP, Unix - Domain Sockets and RDMA transport protocols. +.. only:: not DISABLE_GLUSTERFS =20 - Syntax for specifying a VM disk image on GlusterFS volume is + ``GlusterFS`` + GlusterFS is a user space distributed file system. QEMU supports the + use of GlusterFS volumes for hosting VM disk images using TCP, Unix + Domain Sockets and RDMA transport protocols. =20 - .. parsed-literal:: + Syntax for specifying a VM disk image on GlusterFS volume is =20 - URI: - gluster[+type]://[host[:port]]/volume/path[?socket=3D...][,debug=3DN= ][,logfile=3D...] + .. parsed-literal:: =20 - JSON: - 'json:{"driver":"qcow2","file":{"driver":"gluster","volume":"testvol= ","path":"a.img","debug":N,"logfile":"...", - =C2=A0 "server":[{"type":"tcp","host"= :"...","port":"..."}, - =C2=A0 {"type":"unix","sock= et":"..."}]}}' + URI: + gluster[+type]://[host[:port]]/volume/path[?socket=3D...][,debug= =3DN][,logfile=3D...] =20 - Example + JSON: + 'json:{"driver":"qcow2","file":{"driver":"gluster","volume":"tes= tvol","path":"a.img","debug":N,"logfile":"...", + =C2=A0 "server":[{"type":"tcp","h= ost":"...","port":"..."}, + =C2=A0 {"type":"unix","= socket":"..."}]}}' =20 - .. parsed-literal:: + Example + + .. parsed-literal:: =20 - URI: - |qemu_system| --drive file=3Dgluster://192.0.2.1/testvol/a.img, - =C2=A0 file.debug=3D9,file.logfile=3D/v= ar/log/qemu-gluster.log - - JSON: - |qemu_system| 'json:{"driver":"qcow2", - =C2=A0 "file":{"driver":"gluster", - =C2=A0 "volume":"testvol","path":"a= .img", - =C2=A0 "debug":9,"logfile":"/var/lo= g/qemu-gluster.log", - =C2=A0 "server":[{"type":"tcp","hos= t":"1.2.3.4","port":24007}, - =C2=A0 {"type":"unix","so= cket":"/var/run/glusterd.socket"}]}}' - |qemu_system| -drive driver=3Dqcow2,file.driver=3Dgluster,file.volum= e=3Dtestvol,file.path=3D/path/a.img, - =C2=A0 file.debug=3D9,file.logfi= le=3D/var/log/qemu-gluster.log, - =C2=A0 file.server.0.type=3Dtcp,= file.server.0.host=3D1.2.3.4,file.server.0.port=3D24007, - =C2=A0 file.server.1.type=3Dunix= ,file.server.1.socket=3D/var/run/glusterd.socket - - See also http://www.gluster.org. + URI: + |qemu_system| --drive file=3Dgluster://192.0.2.1/testvol/a.img, + =C2=A0 file.debug=3D9,file.logfile= =3D/var/log/qemu-gluster.log + + JSON: + |qemu_system| 'json:{"driver":"qcow2", + =C2=A0 "file":{"driver":"gluster", + =C2=A0 "volume":"testvol","path= ":"a.img", + =C2=A0 "debug":9,"logfile":"/va= r/log/qemu-gluster.log", + =C2=A0 "server":[{"type":"tcp",= "host":"1.2.3.4","port":24007}, + =C2=A0 {"type":"unix"= ,"socket":"/var/run/glusterd.socket"}]}}' + |qemu_system| -drive driver=3Dqcow2,file.driver=3Dgluster,file.v= olume=3Dtestvol,file.path=3D/path/a.img, + =C2=A0 file.debug=3D9,file.l= ogfile=3D/var/log/qemu-gluster.log, + =C2=A0 file.server.0.type=3D= tcp,file.server.0.host=3D1.2.3.4,file.server.0.port=3D24007, + =C2=A0 file.server.1.type=3D= unix,file.server.1.socket=3D/var/run/glusterd.socket + + See also http://www.gluster.org. =20 .. only:: not DISABLE_CURL =20 --=20 2.31.1