Commit 7504edf4 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

mirror: 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 mirror block job.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarBenoit Canet <benoit@irqsave.net>
parent 5fb09cd5

block/mirror.c

+6 −1
Original line number Diff line number Diff line
@@ -367,7 +367,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);