diff options
author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2018-07-04 14:23:01 +0300 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2018-07-07 20:30:09 -0500 |
commit | 0c0eaed14721f8a9db334deb35316411c512059a (patch) | |
tree | 43019b030a269661197839b9d2bfa85e7c2b77f9 /nbd | |
parent | 43a473993fd9378bf850dcafa68eb6dee8c300f8 (diff) | |
download | qemu-0c0eaed14721f8a9db334deb35316411c512059a.zip qemu-0c0eaed14721f8a9db334deb35316411c512059a.tar.gz qemu-0c0eaed14721f8a9db334deb35316411c512059a.tar.bz2 |
nbd/server: fix nbd_co_send_block_status
Call nbd_co_send_extents() with correct length parameter
(extent.length may be smaller than original length).
Also, switch length parameter type to uint32_t, to correspond with
request->len and similar nbd_co_send_bitmap().
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20180704112302.471456-2-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'nbd')
-rw-r--r-- | nbd/server.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nbd/server.c b/nbd/server.c index e52b76b..ea5fe0e 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1910,7 +1910,7 @@ static int nbd_co_send_extents(NBDClient *client, uint64_t handle, /* Get block status from the exported device and send it to the client */ static int nbd_co_send_block_status(NBDClient *client, uint64_t handle, BlockDriverState *bs, uint64_t offset, - uint64_t length, bool last, + uint32_t length, bool last, uint32_t context_id, Error **errp) { int ret; @@ -1922,7 +1922,8 @@ static int nbd_co_send_block_status(NBDClient *client, uint64_t handle, client, handle, -ret, "can't get block status", errp); } - return nbd_co_send_extents(client, handle, &extent, 1, length, last, + return nbd_co_send_extents(client, handle, &extent, 1, + be32_to_cpu(extent.length), last, context_id, errp); } |