diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2016-01-07 14:34:13 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-01-15 18:58:02 +0100 |
commit | f1c17521e79df863a5771d96974fab0d07f02be0 (patch) | |
tree | bae9be2eab046875ad495fb59a345d8ab30d0703 /block | |
parent | eb38c3b67018ff8069e4f674a28661931a8a3e4f (diff) |
nbd-server: do not exit on failed memory allocation
The amount of memory allocated in nbd_co_receive_request is driven by the
NBD client (possibly a virtual machine). Parallel I/O can cause the
server to allocate a large amount of memory; check for failures and
return ENOMEM in that case.
Cc: qemu-block@nongnu.org
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/block-backend.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index f41d326b3c..e81375955f 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1033,6 +1033,11 @@ void blk_set_guest_block_size(BlockBackend *blk, int align) blk->guest_block_size = align; } +void *blk_try_blockalign(BlockBackend *blk, size_t size) +{ + return qemu_try_blockalign(blk ? blk->bs : NULL, size); +} + void *blk_blockalign(BlockBackend *blk, size_t size) { return qemu_blockalign(blk ? blk->bs : NULL, size); |