diff mbox

[PULL,01/14] file_ram_alloc: propagate error to caller instead of terminating QEMU

Message ID 1446653912-116150-2-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini Nov. 4, 2015, 4:18 p.m. UTC 
From: Igor Mammedov <imammedo@redhat.com>

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>
---
 exec.c | 4 ----
 1 file changed, 4 deletions(-)
diff mbox

Patch

diff --git a/exec.c b/exec.c
index 8af2570..7431f2f 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