aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHu Tao <hutao@cn.fujitsu.com>2014-09-09 13:27:58 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2014-09-09 13:41:44 +0200
commitd42e2de7bc0af5ff08143312d4a22c01e7da3da1 (patch)
tree2b6416391f25fcc8ca78b0803af3b63ac02b67cc
parent33e0eb5297883444f784a7c22bcf30550a30d601 (diff)
hostmem-ram: don't exit qemu if size of memory-backend-ram is way too big
When using monitor command object_add to add a memory backend whose size is way too big to allocate memory for it, qemu just exits. In the case we'd better give an error message and keep guest running. The problem can be reproduced as follows: 1. run qemu 2. (monitor)object_add memory-backend-ram,size=100000G,id=ram0 Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--backends/hostmem-ram.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c
index e55d066cde..a67a134521 100644
--- a/backends/hostmem-ram.c
+++ b/backends/hostmem-ram.c
@@ -27,7 +27,7 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
path = object_get_canonical_path_component(OBJECT(backend));
memory_region_init_ram(&backend->mr, OBJECT(backend), path,
- backend->size, &error_abort);
+ backend->size, errp);
g_free(path);
}