diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-03-22 10:17:57 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-03-22 10:17:57 +0000 |
| commit | 5791de9d48743c7fde0c0d9b065f260056968e99 (patch) | |
| tree | 287c82a5f4e20557632eafd7ac23288bb51bf79d /docs | |
| parent | 48fb0a826eea2e7b0135f49e7fa63e7efe2b7677 (diff) | |
| parent | 6690302b848e5b55e3e3da34f0ee7fd9f8602e23 (diff) | |
| download | focaccia-qemu-5791de9d48743c7fde0c0d9b065f260056968e99.tar.gz focaccia-qemu-5791de9d48743c7fde0c0d9b065f260056968e99.zip | |
Merge tag 'pull-nbd-2022-03-21' of https://repo.or.cz/qemu/ericb into staging
nbd patches for 2022-03-21 - Rao Lei: fix nbd client hang on server death - Vladimir Sementsov-Ogievskiy: email address update - Eric Blake: qemu-nbd documentation tweak # gpg: Signature made Mon 21 Mar 2022 21:35:50 GMT # gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full] # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full] # gpg: aka "[jpeg image of size 6874]" [full] # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * tag 'pull-nbd-2022-03-21' of https://repo.or.cz/qemu/ericb: block/nbd.c: Fixed IO request coroutine not being wakeup when kill NBD server docs: Consistent typography for options of qemu-nbd MAINTAINERS: change Vladimir's email address Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/tools/qemu-nbd.rst | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/tools/qemu-nbd.rst b/docs/tools/qemu-nbd.rst index 2b8c90c354..4c950f6199 100644 --- a/docs/tools/qemu-nbd.rst +++ b/docs/tools/qemu-nbd.rst @@ -27,7 +27,7 @@ Options .. program:: qemu-nbd *filename* is a disk image filename, or a set of block -driver options if ``--image-opts`` is specified. +driver options if :option:`--image-opts` is specified. *dev* is an NBD device. @@ -165,9 +165,9 @@ driver options if ``--image-opts`` is specified. .. option:: --tls-creds=ID Enable mandatory TLS encryption for the server by setting the ID - of the TLS credentials object previously created with the --object - option; or provide the credentials needed for connecting as a client - in list mode. + of the TLS credentials object previously created with the + :option:`--object` option; or provide the credentials needed for + connecting as a client in list mode. .. option:: --tls-hostname=hostname @@ -176,11 +176,11 @@ driver options if ``--image-opts`` is specified. against information in the server provided certificate. Sometimes it might be required to override the hostname used to perform this check. For example, if the NBD client is using a tunnel from localhost - to connect to the remote server, the `--tls-hostname` option should + to connect to the remote server, the :option:`--tls-hostname` option should be used to set the officially expected hostname of the remote NBD server. This can also be used if accessing NBD over a UNIX socket where there is no inherent hostname available. This is only permitted - when acting as a NBD client with the `--list` option. + when acting as a NBD client with the :option:`--list` option. .. option:: --fork |