Commit cc35a44c authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f2bcdc8d e4d9df4f

exec.c

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

monitor.c

+5 −2
Original line number Diff line number Diff line
@@ -4747,9 +4747,12 @@ static void monitor_find_completion(void *opaque, 
        return;

    }

#ifdef DEBUG_COMPLETION

    {

        int i;

        for (i = 0; i < nb_args; i++) {

            monitor_printf(mon, "arg%d = '%s'\n", i, args[i]);

        }

    }

#endif



    /* if the line ends with a space, it means we want to complete the