diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2014-05-21 18:05:47 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-08-15 15:07:16 +0200 |
| commit | 4b6af3d58a73193017926dd59de3b3e7b4890323 (patch) | |
| tree | 5f7dfd71f6c124e6e2fc688f84d1ec8b19fd54c9 /block | |
| parent | 50d4a858e62b1d864227d13f07d2c79c118d046a (diff) | |
| download | qemu-4b6af3d58a73193017926dd59de3b3e7b4890323.tar.gz qemu-4b6af3d58a73193017926dd59de3b3e7b4890323.tar.bz2 qemu-4b6af3d58a73193017926dd59de3b3e7b4890323.zip | |
raw-win32: Handle failure for potentially large allocations
Some code in the block layer makes potentially huge allocations. Failure
is not completely unexpected there, so avoid aborting qemu and handle
out-of-memory situations gracefully.
This patch addresses the allocations in the raw-win32 block driver.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/win32-aio.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/win32-aio.c b/block/win32-aio.c index 8e417f70ae..5030e3274d 100644 --- a/block/win32-aio.c +++ b/block/win32-aio.c @@ -139,7 +139,10 @@ BlockDriverAIOCB *win32_aio_submit(BlockDriverState *bs, waiocb->is_read = (type == QEMU_AIO_READ); if (qiov->niov > 1) { - waiocb->buf = qemu_blockalign(bs, qiov->size); + waiocb->buf = qemu_try_blockalign(bs, qiov->size); + if (waiocb->buf == NULL) { + goto out; + } if (type & QEMU_AIO_WRITE) { iov_to_buf(qiov->iov, qiov->niov, 0, waiocb->buf, qiov->size); } @@ -168,6 +171,7 @@ BlockDriverAIOCB *win32_aio_submit(BlockDriverState *bs, out_dec_count: aio->count--; +out: qemu_aio_release(waiocb); return NULL; } |