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:
|
error:
|
||||||
if (mem_prealloc) {
|
if (mem_prealloc) {
|
||||||
|
error_report("%s\n", error_get_pretty(*errp));
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -4747,9 +4747,12 @@ static void monitor_find_completion(void *opaque,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#ifdef DEBUG_COMPLETION
|
#ifdef DEBUG_COMPLETION
|
||||||
|
{
|
||||||
|
int i;
|
||||||
for (i = 0; i < nb_args; i++) {
|
for (i = 0; i < nb_args; i++) {
|
||||||
monitor_printf(mon, "arg%d = '%s'\n", i, args[i]);
|
monitor_printf(mon, "arg%d = '%s'\n", i, args[i]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* if the line ends with a space, it means we want to complete the
|
/* if the line ends with a space, it means we want to complete the
|
||||||
|
|
Loading…
Reference in a new issue