Commit 3dabde11 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20170914' into staging 



HMP pull 2017-09-14

# gpg: Signature made Thu 14 Sep 2017 15:57:30 BST
# gpg:                using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-hmp-20170914:
  hmp: introduce 'info memory_size_summary' command
  qmp: introduce query-memory-size-summary command
  hmp: extend "info numa" with hotplugged memory information
  tests/hmp: test "none" machine with memory
  dump: do not dump non-existent guest memory
  hmp: fix "dump-quest-memory" segfault (arm)
  hmp: fix "dump-quest-memory" segfault (ppc)

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents dae288d7 d0f63c1e

dump.c

+6 −0
Original line number Diff line number Diff line
@@ -1536,6 +1536,12 @@ static void dump_init(DumpState *s, int fd, bool has_format, 
    fprintf(stderr, "DUMP: total memory to dump: %lu\n", s->total_size);

#endif



    /* it does not make sense to dump non-existent memory */

    if (!s->total_size) {

        error_setg(errp, "dump: no guest memory to dump");

        goto cleanup;

    }



    s->start = get_start_block(s);

    if (s->start == -1) {

        error_setg(errp, QERR_INVALID_PARAMETER, "begin");

hmp-commands-info.hx

+16 −0
Original line number Diff line number Diff line
@@ -850,6 +850,22 @@ ETEXI 
        .cmd = hmp_info_vm_generation_id,

    },



STEXI

@item info memory_size_summary

@findex memory_size_summary

Display the amount of initially allocated and present hotpluggable (if

enabled) memory in bytes.

ETEXI



    {

        .name       = "memory_size_summary",

        .args_type  = "",

        .params     = "",

        .help       = "show the amount of initially allocated and "

                      "present hotpluggable (if enabled) memory in bytes.",

        .cmd        = hmp_info_memory_size_summary,

    },



STEXI

@end table

ETEXI

hmp.c

+18 −0
Original line number Diff line number Diff line
@@ -2862,3 +2862,21 @@ void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict) 
    hmp_handle_error(mon, &err);

    qapi_free_GuidInfo(info);

}



void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict)

{

    Error *err = NULL;

    MemoryInfo *info = qmp_query_memory_size_summary(&err);

    if (info) {

        monitor_printf(mon, "base memory: %" PRIu64 "\n",

                       info->base_memory);



        if (info->has_plugged_memory) {

            monitor_printf(mon, "plugged memory: %" PRIu64 "\n",

                           info->plugged_memory);

        }



        qapi_free_MemoryInfo(info);

    }

    hmp_handle_error(mon, &err);

}

hmp.h

+1 −0
Original line number Diff line number Diff line
@@ -145,5 +145,6 @@ void hmp_info_dump(Monitor *mon, const QDict *qdict); 
void hmp_info_ramblock(Monitor *mon, const QDict *qdict);

void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict);

void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict);

void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict);



#endif

hw/mem/pc-dimm.c

+5 −0
Original line number Diff line number Diff line
@@ -159,6 +159,11 @@ uint64_t pc_existing_dimms_capacity(Error **errp) 
    return cap.size;

}



uint64_t get_plugged_memory_size(void)

{

    return pc_existing_dimms_capacity(&error_abort);

}



int qmp_pc_dimm_device_list(Object *obj, void *opaque)

{

    MemoryDeviceInfoList ***prev = opaque;