diff options
| -rw-r--r-- | MAINTAINERS | 12 | ||||
| -rw-r--r-- | block/nbd.c | 2 | ||||
| -rw-r--r-- | docs/tools/qemu-nbd.rst | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9aed5f3e04..cc364afef7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2507,7 +2507,7 @@ F: scsi/* Block Jobs M: John Snow <jsnow@redhat.com> -M: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> +M: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru> L: qemu-block@nongnu.org S: Supported F: blockjob.c @@ -2546,7 +2546,7 @@ T: git https://repo.or.cz/qemu/armbru.git block-next Dirty Bitmaps M: Eric Blake <eblake@redhat.com> -M: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> +M: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru> R: John Snow <jsnow@redhat.com> L: qemu-block@nongnu.org S: Supported @@ -2770,13 +2770,13 @@ F: scripts/*.py F: tests/*.py Benchmark util -M: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> +M: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru> S: Maintained F: scripts/simplebench/ T: git https://src.openvz.org/scm/~vsementsov/qemu.git simplebench Transactions helper -M: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> +M: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru> S: Maintained F: include/qemu/transactions.h F: util/transactions.c @@ -3360,7 +3360,7 @@ F: block/iscsi-opts.c Network Block Device (NBD) M: Eric Blake <eblake@redhat.com> -M: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> +M: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru> L: qemu-block@nongnu.org S: Maintained F: block/nbd* @@ -3456,7 +3456,7 @@ F: block/dmg.c parallels M: Stefan Hajnoczi <stefanha@redhat.com> M: Denis V. Lunev <den@openvz.org> -M: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> +M: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru> L: qemu-block@nongnu.org S: Supported F: block/parallels.c diff --git a/block/nbd.c b/block/nbd.c index 34b9429de3..567872ac53 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -533,8 +533,8 @@ err: if (i != -1) { s->requests[i].coroutine = NULL; s->in_flight--; - qemu_co_queue_next(&s->free_sema); } + qemu_co_queue_next(&s->free_sema); } qemu_co_mutex_unlock(&s->send_mutex); return rc; 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 |