From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org,
timao@redhat.com
Subject: [PATCH 3/5] docs: Only mention ssh in the man page when available
Date: Mon, 31 Jan 2022 18:04:09 +0100 [thread overview]
Message-ID: <20220131170411.125198-4-kwolf@redhat.com> (raw)
In-Reply-To: <20220131170411.125198-1-kwolf@redhat.com>
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 <kwolf@redhat.com>
---
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.
|qemu_system| --drive file=nbd:unix:/tmp/nbd-socket
-``SSH``
- QEMU supports SSH (Secure Shell) access to remote disks.
+.. only:: not DISABLE_LIBSSH
- Examples:
+ ``SSH``
+ QEMU supports SSH (Secure Shell) access to remote disks.
- .. parsed-literal::
+ Examples:
+
+ .. parsed-literal::
- |qemu_system| -drive file=ssh://user@host/path/to/disk.img
- |qemu_system| -drive file.driver=ssh,file.user=user,file.host=host,file.port=22,file.path=/path/to/disk.img
+ |qemu_system| -drive file=ssh://user@host/path/to/disk.img
+ |qemu_system| -drive file.driver=ssh,file.user=user,file.host=host,file.port=22,file.path=/path/to/disk.img
- 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.
``GlusterFS``
GlusterFS is a user space distributed file system. QEMU supports the
--
2.31.1
next prev parent reply other threads:[~2022-01-31 17:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-31 17:04 [PATCH 0/5] docs: Don't document disabled features Kevin Wolf
2022-01-31 17:04 ` [PATCH 1/5] docs: Pass disabled configure options to sphinx Kevin Wolf
2022-01-31 17:53 ` Daniel P. Berrangé
2022-01-31 17:04 ` [PATCH 2/5] docs: Only mention iscsi in the man page when available Kevin Wolf
2022-01-31 18:57 ` Peter Maydell
2022-02-01 8:40 ` Kevin Wolf
2022-01-31 17:04 ` Kevin Wolf [this message]
2022-01-31 17:04 ` [PATCH 4/5] docs: Only mention curl " Kevin Wolf
2022-01-31 17:04 ` [PATCH 5/5] docs: Only mention gluster " Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220131170411.125198-4-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=timao@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).