david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: Use common req handling in copy offloading

Browse Source 
This brings the request handling logic inline with write and discard,
fixing write_gen, resize_cb, dirty bitmaps and image size refreshing.
The last of these issues broke iotest case 222, which is now fixed.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fam Zheng 2018-07-10 14:31:22 +08:00 committed by Kevin Wolf
parent 00695c27a0
commit 0eb1e89112
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block/io.c
View File

@ -3030,20 +3030,16 @@ static int coroutine_fn bdrv_co_copy_range_internal(
bdrv_inc_in_flight(dst->bs); bdrv_inc_in_flight(dst->bs);
tracked_request_begin(&req, dst->bs, dst_offset, bytes, tracked_request_begin(&req, dst->bs, dst_offset, bytes,
BDRV_TRACKED_WRITE); BDRV_TRACKED_WRITE);
ret = bdrv_co_write_req_prepare(dst, dst_offset, bytes, &req,
/* BDRV_REQ_NO_SERIALISING is only for read operation */ write_flags);
assert(!(write_flags & BDRV_REQ_NO_SERIALISING)); if (!ret) {
if (write_flags & BDRV_REQ_SERIALISING) {
mark_request_serialising(&req, bdrv_get_cluster_size(dst->bs));
}
wait_serialising_requests(&req);
ret = dst->bs->drv->bdrv_co_copy_range_to(dst->bs, ret = dst->bs->drv->bdrv_co_copy_range_to(dst->bs,
src, src_offset, src, src_offset,
dst, dst_offset, dst, dst_offset,
bytes, bytes,
read_flags, write_flags); read_flags, write_flags);
}
bdrv_co_write_req_finish(dst, dst_offset, bytes, &req, ret);
tracked_request_end(&req); tracked_request_end(&req);
bdrv_dec_in_flight(dst->bs); bdrv_dec_in_flight(dst->bs);
} }