OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

nbd patches for 2022-03-21

Browse Source 
- Rao Lei: fix nbd client hang on server death
 - Vladimir Sementsov-Ogievskiy: email address update
 - Eric Blake: qemu-nbd documentation tweak
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAmI477YACgkQp6FrSiUn
 Q2oQygf6ArqLo7bOBMLmEf/JIeK7qi3pv0G5DrTTeVl+wl5X2soclFx6cdRWh3pN
 wtFZR70fXtjChFjB8M2s9W9Ycr3Ze7mShr6KyVLrWXDMDNhDrue61v3q09BEnoWu
 C1Z5tyY5zRydZ7nqsdiqK9oOQqqDNNF/ZXczn5fj+epdakPlps5K1iDSfoqXcHrn
 QA6qWUnhxN5RC2mM0AMKO6PZ2cjW4ES4lRQ0u7gi5tGgU4SKnUbB3kAZd8NyG1F/
 cexC6hp8zEjjkW/CJ1k3ARcT/ew4vvIMUgMpMSi60f/TTAIQncbx1/54fZ6S9Fxt
 drlMhY34c/crKJCRwmrBrKRqt+Stqg==
 =8E3M
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2022-03-22 10:17:57 +00:00
commit 5791de9d48
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MAINTAINERS
View File

@ -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

2
block/nbd.c
View File

@ -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;

12
docs/tools/qemu-nbd.rst
View File

@ -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