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

Revert "block: prevent multiwrite_merge from creating too large iovecs"

Browse Source 
This reverts commit 0076bc0c1d93adcbc7f1af184e04902cf37e9ab8.

Kevin Wolf pointed out that this breaks the mingw32 build.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2010-01-20 10:12:23 -06:00
parent a6a853c862
commit 3e39789b64
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block.c
View File

@ -1689,10 +1689,6 @@ static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs,
merge = bs->drv->bdrv_merge_requests(bs, &reqs[outidx], &reqs[i]); merge = bs->drv->bdrv_merge_requests(bs, &reqs[outidx], &reqs[i]);
} }
if (reqs[outidx].qiov->niov + reqs[i].qiov->niov + 1 > IOV_MAX) {
merge = 0;
}
if (merge) { if (merge) {
size_t size; size_t size;
QEMUIOVector *qiov = qemu_mallocz(sizeof(*qiov)); QEMUIOVector *qiov = qemu_mallocz(sizeof(*qiov));