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

block: avoid creating oversized writes in multiwrite_merge

Browse Source 
Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Peter Lieven 2014-10-27 10:18:46 +01:00 committed by Stefan Hajnoczi
parent 52f6fa1430
commit 6c5a42ac34
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block.c
View File

@ -4446,6 +4446,11 @@ static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs,
merge = 0; merge = 0;
} }
if (bs->bl.max_transfer_length && reqs[outidx].nb_sectors +
reqs[i].nb_sectors > bs->bl.max_transfer_length) {
merge = 0;
}
if (merge) { if (merge) {
size_t size; size_t size;
QEMUIOVector *qiov = g_malloc0(sizeof(*qiov)); QEMUIOVector *qiov = g_malloc0(sizeof(*qiov));