Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp: exec: file_ram_alloc(): print error when prealloc fails monitor: fix debug print compiling error Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
cc35a44cf7
1
exec.c
1
exec.c
|
@ -1164,6 +1164,7 @@ static void *file_ram_alloc(RAMBlock *block,
|
|||
|
||||
error:
|
||||
if (mem_prealloc) {
|
||||
error_report("%s\n", error_get_pretty(*errp));
|
||||
exit(1);
|
||||
}
|
||||
return NULL;
|
||||
|
|
Loading…
Reference in a new issue