[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 20/21] mirror: Handle failure for potentially lar
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v4 20/21] mirror: Handle failure for potentially large allocations |
Date: |
Tue, 24 Jun 2014 17:37:02 +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 mirror block job.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
---
block/mirror.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/block/mirror.c b/block/mirror.c
index 705260a..e455dc0 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -359,7 +359,12 @@ static void coroutine_fn mirror_run(void *opaque)
}
end = s->common.len >> BDRV_SECTOR_BITS;
- s->buf = qemu_blockalign(bs, s->buf_size);
+ s->buf = qemu_try_blockalign(bs, s->buf_size);
+ if (s->buf == NULL) {
+ ret = -ENOMEM;
+ goto immediate_exit;
+ }
+
sectors_per_chunk = s->granularity >> BDRV_SECTOR_BITS;
mirror_free_init(s);
--
1.8.3.1
- [Qemu-devel] [PATCH v4 08/21] nfs: Handle failure for potentially large allocations, (continued)
- [Qemu-devel] [PATCH v4 08/21] nfs: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 09/21] parallels: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 12/21] qed: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 10/21] qcow1: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 11/21] qcow2: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 13/21] raw-posix: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 16/21] vdi: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 15/21] rbd: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 17/21] vhdx: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 18/21] vmdk: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 20/21] mirror: Handle failure for potentially large allocations,
Kevin Wolf <=
- [Qemu-devel] [PATCH v4 21/21] qcow2: Return useful error code in refcount_init(), Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 14/21] raw-win32: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24
- [Qemu-devel] [PATCH v4 19/21] vpc: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/24