]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
block: bdrv_aligned_pwritev: Assert overlap range
authorKevin Wolf <kwolf@redhat.com>
Fri, 7 Feb 2014 14:35:56 +0000 (15:35 +0100)
committerKevin Wolf <kwolf@redhat.com>
Sun, 9 Feb 2014 08:12:39 +0000 (09:12 +0100)
This adds assertions that the request that we actually end up passing to
the block driver (which includes RMW data and has therefore potentially
been rounded to alignment boundaries) is fully covered by the
overlap_{offset,size} fields of the associated BdrvTrackedRequest.

Suggested-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
block.c

diff --git a/block.c b/block.c
index c1d1f74b88c4233eeaf56ca98de2051f56657822..a027823ea4f684fd1dca31a67a53128517a55b9d 100644 (file)
--- a/block.c
+++ b/block.c
@@ -3134,6 +3134,8 @@ static int coroutine_fn bdrv_aligned_pwritev(BlockDriverState *bs,
 
     waited = wait_serialising_requests(req);
     assert(!waited || !req->serialising);
+    assert(req->overlap_offset <= offset);
+    assert(offset + bytes <= req->overlap_offset + req->overlap_bytes);
 
     ret = notifier_with_return_list_notify(&bs->before_write_notifiers, req);