aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2015-10-19 19:11:11 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-11-02 14:50:27 +0100
commitcc57501dee37376d0a2fbc5921e0f3a9ed4b117d (patch)
tree5301b4292cb06cd6580606dbeef5dc269c107ce9
parent7bc8e0c967a4ef77657174d28af775691e18b4ce (diff)
file_ram_alloc: propagate error to caller instead of terminating QEMU
QEMU shouldn't exits from file_ram_alloc() if -mem-prealloc option is specified and "object_add memory-backend-file,..." fails allocation during memory hotplug. Propagate error to a caller and let it decide what to do with allocation failure. That leaves QEMU alive if it can't create backend during hotplug time and kills QEMU at startup time if backends or initial memory were misconfigured/ too large. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <1445274671-17704-1-git-send-email-imammedo@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--exec.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/exec.c b/exec.c
index 8af2570579..7431f2f449 100644
--- a/exec.c
+++ b/exec.c
@@ -1282,10 +1282,6 @@ static void *file_ram_alloc(RAMBlock *block,
return area;
error:
- if (mem_prealloc) {
- error_report("%s", error_get_pretty(*errp));
- exit(1);
- }
return NULL;
}
#endif