From: Vladimir Sementsov-Ogievskiy Date: Wed, 4 Jul 2018 11:23:01 +0000 (+0300) Subject: nbd/server: fix nbd_co_send_block_status X-Git-Tag: v3.0.0-rc0~12^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c0eaed14721f8a9db334deb35316411c512059a;p=thirdparty%2Fqemu.git 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 Message-Id: <20180704112302.471456-2-vsementsov@virtuozzo.com> Signed-off-by: Eric Blake --- diff --git a/nbd/server.c b/nbd/server.c index e52b76bd1a4..ea5fe0eb336 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); }