mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Fix bdrv_aligned_p*v() for qiov_offset != 0

Browse Source 
Since these functions take a @qiov_offset, they must always take it into
account when working with @qiov.  There are a couple of places where
they do not, but they should.

Fixes: 65cd4424b9
       ("block/io: bdrv_aligned_preadv: use and support qiov_offset")
Fixes: 28c4da2869
       ("block/io: bdrv_aligned_pwritev: use and support qiov_offset")
Reported-by: Claudio Fontana <cfontana@suse.de>
Reported-by: Bruce Rogers <brogers@suse.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200728120806.265916-2-mreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Tested-by: Claudio Fontana <cfontana@suse.de>
Tested-by: Bruce Rogers <brogers@suse.com>
This commit is contained in:
Max Reitz 2020-07-28 14:08:04 +02:00
parent 23ae28783f
commit 134b7dec6e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/io.c
View File

@ -1524,12 +1524,13 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChild *child,
assert(num); assert(num);
ret = bdrv_driver_preadv(bs, offset + bytes - bytes_remaining, ret = bdrv_driver_preadv(bs, offset + bytes - bytes_remaining,
num, qiov, bytes - bytes_remaining, 0); num, qiov,
qiov_offset + bytes - bytes_remaining, 0);
max_bytes -= num; max_bytes -= num;
} else { } else {
num = bytes_remaining; num = bytes_remaining;
ret = qemu_iovec_memset(qiov, bytes - bytes_remaining, 0, ret = qemu_iovec_memset(qiov, qiov_offset + bytes - bytes_remaining,
bytes_remaining); 0, bytes_remaining);
} }
if (ret < 0) { if (ret < 0) {
goto out; goto out;
@ -2032,7 +2033,8 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child,
} }
ret = bdrv_driver_pwritev(bs, offset + bytes - bytes_remaining, ret = bdrv_driver_pwritev(bs, offset + bytes - bytes_remaining,
num, qiov, bytes - bytes_remaining, num, qiov,
qiov_offset + bytes - bytes_remaining,
local_flags); local_flags);
if (ret < 0) { if (ret < 0) {
break; break;