diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-22 10:11:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-22 10:11:28 +0100 |
| commit | b9e02bb3f98174209dbd5c96858e65a31723221b (patch) | |
| tree | 0ab801f8ceb104c4330cc7a9c4d1053911a47ffa /block | |
| parent | 4a10982c320740d2d0565180d901a69b043dc282 (diff) | |
| parent | 5cf42b1c1f75499b467701926d3c9691d27712e1 (diff) | |
| download | qemu-b9e02bb3f98174209dbd5c96858e65a31723221b.zip qemu-b9e02bb3f98174209dbd5c96858e65a31723221b.tar.gz qemu-b9e02bb3f98174209dbd5c96858e65a31723221b.tar.bz2 | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-07-19' into staging
nbd patches for 2019-07-19
- silence harmless compiler/valgrind warning
# gpg: Signature made Fri 19 Jul 2019 21:17:12 BST
# gpg: using RSA key A7A16B4A2527436A
# 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
* remotes/ericb/tags/pull-nbd-2019-07-19:
nbd: Initialize reply on failure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/nbd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/nbd.c b/block/nbd.c index 81edabb..57c1a20 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -640,12 +640,11 @@ static coroutine_fn int nbd_co_receive_one_chunk( request_ret, qiov, payload, errp); if (ret < 0) { + memset(reply, 0, sizeof(*reply)); s->quit = true; } else { /* For assert at loop start in nbd_connection_entry */ - if (reply) { - *reply = s->reply; - } + *reply = s->reply; s->reply.handle = 0; } |