From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQEjj-00083P-SP for qemu-devel@nongnu.org; Fri, 23 Nov 2018 11:55:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gQEje-0002CN-IL for qemu-devel@nongnu.org; Fri, 23 Nov 2018 11:55:23 -0500 From: Vladimir Sementsov-Ogievskiy Date: Fri, 23 Nov 2018 19:55:09 +0300 Message-Id: <20181123165511.416480-10-vsementsov@virtuozzo.com> In-Reply-To: <20181123165511.416480-1-vsementsov@virtuozzo.com> References: <20181123165511.416480-1-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 09/11] qcow2: qcow2_co_preadv: skip using hd_qiov when possible List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-block@nongnu.org Cc: mreitz@redhat.com, kwolf@redhat.com, berrange@redhat.com, berto@igalia.com, vsementsov@virtuozzo.com, den@openvz.org qemu_iovec_memset has @offset parameter, so using hd_qiov for it is not needed. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 5467089cfe..bbd6df3614 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1928,18 +1928,13 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, goto fail; } - offset_in_cluster = offset_into_cluster(s, offset); - - qemu_iovec_reset(&hd_qiov); - qemu_iovec_concat(&hd_qiov, qiov, bytes_done, cur_bytes); - if (ret == QCOW2_CLUSTER_ZERO_PLAIN || ret == QCOW2_CLUSTER_ZERO_ALLOC || (ret == QCOW2_CLUSTER_UNALLOCATED && !bs->backing)) { /* No sense in releasing the lock */ - qemu_iovec_memset(&hd_qiov, 0, 0, cur_bytes); + qemu_iovec_memset(qiov, bytes_done, 0, cur_bytes); bytes -= cur_bytes; offset += cur_bytes; @@ -1947,6 +1942,11 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, continue; } + offset_in_cluster = offset_into_cluster(s, offset); + + qemu_iovec_reset(&hd_qiov); + qemu_iovec_concat(&hd_qiov, qiov, bytes_done, cur_bytes); + qemu_co_mutex_unlock(&s->lock); switch (ret) { -- 2.18.0