Commit b9e02bb3 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4a10982c 5cf42b1c

block/nbd.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

        }

        s->reply.handle = 0;

    }