From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQ709-0002Dt-3x for qemu-devel@nongnu.org; Tue, 05 Jun 2018 04:07:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQ702-000313-K0 for qemu-devel@nongnu.org; Tue, 05 Jun 2018 04:07:33 -0400 From: Fam Zheng Date: Tue, 5 Jun 2018 16:07:09 +0800 Message-Id: <20180605080710.27035-2-famz@redhat.com> In-Reply-To: <20180605080710.27035-1-famz@redhat.com> References: <20180605080710.27035-1-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/2] block: Honour BDRV_REQ_NO_SERIALISING in copy range List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Fam Zheng , Stefan Hajnoczi , Kevin Wolf , Max Reitz , Jeff Cody This semantics is needed by drive-backup so implement it before using this API there. Signed-off-by: Fam Zheng --- block/io.c | 6 ++++-- include/block/block.h | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/block/io.c b/block/io.c index b7beaeeb9f..f55e0c39fe 100644 --- a/block/io.c +++ b/block/io.c @@ -2920,8 +2920,10 @@ int coroutine_fn bdrv_co_copy_range(BdrvChild *src, uint64_t src_offset, tracked_request_begin(&dst_req, dst_bs, dst_offset, bytes, BDRV_TRACKED_WRITE); - wait_serialising_requests(&src_req); - wait_serialising_requests(&dst_req); + if (!(flags & BDRV_REQ_NO_SERIALISING)) { + wait_serialising_requests(&src_req); + wait_serialising_requests(&dst_req); + } ret = bdrv_co_copy_range_from(src, src_offset, dst, dst_offset, bytes, flags); diff --git a/include/block/block.h b/include/block/block.h index 6cc6c7e699..6d3d156927 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -630,13 +630,14 @@ void bdrv_unregister_buf(BlockDriverState *bs, void *host); * @dst: Destination child to copy data to * @dst_offset: offset in @dst image to write data * @bytes: number of bytes to copy - * @flags: request flags. Must be one of: - * 0 - actually read data from src; + * @flags: request flags. Supported flags: * BDRV_REQ_ZERO_WRITE - treat the @src range as zero data and do zero * write on @dst as if bdrv_co_pwrite_zeroes is * called. Used to simplify caller code, or * during BlockDriver.bdrv_co_copy_range_from() * recursion. + * BDRV_REQ_NO_SERIALISING - do not serialize with other overlapping + * requests currently in flight. * * Returns: 0 if succeeded; negative error code if failed. **/ -- 2.17.0