[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/20] raw-win32: Handle failure for potentially lar
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 14/20] raw-win32: Handle failure for potentially large allocations |
Date: |
Wed, 21 May 2014 18:28:12 +0200 |
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 <address@hidden>
---
block/win32-aio.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/block/win32-aio.c b/block/win32-aio.c
index 5d1d199..b8320ce 100644
--- a/block/win32-aio.c
+++ b/block/win32-aio.c
@@ -138,7 +138,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);
}
@@ -167,6 +170,7 @@ BlockDriverAIOCB *win32_aio_submit(BlockDriverState *bs,
out_dec_count:
aio->count--;
+out:
qemu_aio_release(waiocb);
return NULL;
}
--
1.8.3.1
- [Qemu-devel] [PATCH 08/20] nfs: Handle failure for potentially large allocations, (continued)
- [Qemu-devel] [PATCH 08/20] nfs: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 10/20] qcow1: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 11/20] qcow2: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 12/20] qed: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 13/20] raw-posix: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 14/20] raw-win32: Handle failure for potentially large allocations,
Kevin Wolf <=
- [Qemu-devel] [PATCH 15/20] rbd: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 17/20] vhdx: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 16/20] vdi: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 18/20] vmdk: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21
- [Qemu-devel] [PATCH 19/20] vpc: Handle failure for potentially large allocations, Kevin Wolf, 2014/05/21