Commit cc57501d authored by Igor Mammedov's avatar Igor Mammedov Committed by Paolo Bonzini
Browse files

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: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <1445274671-17704-1-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7bc8e0c9

exec.c

+0 −4
Original line number Diff line number Diff line
@@ -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