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

block: avoid creating too large iovecs in multiwrite_merge

Browse Source 
If we go over the maximum number of iovecs support by syscall we get
back EINVAL from the kernel which translate to I/O errors for the guest.

Add a MAX_IOV defintion for platforms that don't have it.  For now we use
the same 1024 define that's used on Linux and various other platforms,
but until the windows block backend implements some kind of vectored I/O
it doesn't matter.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Christoph Hellwig 2010-01-26 14:49:08 +01:00 committed by Anthony Liguori
parent 6185c5783c
commit e2a305fb13
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block.c
View File

@ -1691,6 +1691,10 @@ 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));

4
qemu-common.h
View File

@ -54,6 +54,10 @@ struct iovec {
void *iov_base; void *iov_base;
size_t iov_len; size_t iov_len;
}; };
/*
* Use the same value as Linux for now.
*/
#define IOV_MAX 1024
#else #else
#include <sys/uio.h> #include <sys/uio.h>
#endif #endif