diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-20 10:12:23 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-20 10:12:23 -0600 |
commit | 3e39789b64b01444b6377a043894e6b9a3ba6cbb (patch) | |
tree | 5148ea47a44650a64cf6ac1bc3c3f3271e1991df | |
parent | a6a853c86275efd89996ce59612a000c5873db5d (diff) |
Revert "block: prevent multiwrite_merge from creating too large iovecs"
This reverts commit 0076bc0c1d93adcbc7f1af184e04902cf37e9ab8.
Kevin Wolf pointed out that this breaks the mingw32 build.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | block.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -1689,10 +1689,6 @@ static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs, 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) { size_t size; QEMUIOVector *qiov = qemu_mallocz(sizeof(*qiov)); |