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>
This commit is contained in:
Igor Mammedov 2015-10-19 19:11:11 +02:00 committed by Paolo Bonzini
parent 7bc8e0c967
commit cc57501dee

4
exec.c
View File

@ -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