projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a6a853c
)
Revert "block: prevent multiwrite_merge from creating too large iovecs"
author
Anthony Liguori
<aliguori@us.ibm.com>
Wed, 20 Jan 2010 16:12:23 +0000
(10:12 -0600)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Wed, 20 Jan 2010 16:12:23 +0000
(10:12 -0600)
This reverts commit
0076bc0c1d93adcbc7f1af184e04902cf37e9ab8
.
Kevin Wolf pointed out that this breaks the mingw32 build.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
block.c
patch
|
blob
|
history
diff --git
a/block.c
b/block.c
index cde41295bd438007f79160bbc4d353b9f2398e3a..73c26ec410429fe5282dd66505246752bb015ea5 100644
(file)
--- a/
block.c
+++ b/
block.c
@@
-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));