Commit a631892f authored by Zhu Guihua's avatar Zhu Guihua Committed by Luiz Capitulino
Browse files

Add HMP command "info memory-devices" 



Provides HMP equivalent of QMP query-memory-devices command.

Signed-off-by: default avatarZhu Guihua <zhugh.fnst@cn.fujitsu.com>
Reviewed-By: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 235256a2

hmp-commands.hx

+2 −0
Original line number Diff line number Diff line
@@ -1778,6 +1778,8 @@ show qdev device model list 
show roms

@item info tpm

show the TPM device

@item info memory-devices

show the memory devices

@end table

ETEXI

hmp.c

+38 −0
Original line number Diff line number Diff line
@@ -1720,3 +1720,41 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) 


    qapi_free_MemdevList(memdev_list);

}



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

{

    Error *err = NULL;

    MemoryDeviceInfoList *info_list = qmp_query_memory_devices(&err);

    MemoryDeviceInfoList *info;

    MemoryDeviceInfo *value;

    PCDIMMDeviceInfo *di;



    for (info = info_list; info; info = info->next) {

        value = info->value;



        if (value) {

            switch (value->kind) {

            case MEMORY_DEVICE_INFO_KIND_DIMM:

                di = value->dimm;



                monitor_printf(mon, "Memory device [%s]: \"%s\"\n",

                               MemoryDeviceInfoKind_lookup[value->kind],

                               di->id ? di->id : "");

                monitor_printf(mon, "  addr: 0x%" PRIx64 "\n", di->addr);

                monitor_printf(mon, "  slot: %" PRId64 "\n", di->slot);

                monitor_printf(mon, "  node: %" PRId64 "\n", di->node);

                monitor_printf(mon, "  size: %" PRIu64 "\n", di->size);

                monitor_printf(mon, "  memdev: %s\n", di->memdev);

                monitor_printf(mon, "  hotplugged: %s\n",

                               di->hotplugged ? "true" : "false");

                monitor_printf(mon, "  hotpluggable: %s\n",

                               di->hotpluggable ? "true" : "false");

                break;

            default:

                break;

            }

        }

    }



    qapi_free_MemoryDeviceInfoList(info_list);

}

hmp.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ void hmp_cpu_add(Monitor *mon, const QDict *qdict); 
void hmp_object_add(Monitor *mon, const QDict *qdict);

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

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

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

void object_add_completion(ReadLineState *rs, int nb_args, const char *str);

void object_del_completion(ReadLineState *rs, int nb_args, const char *str);

void device_add_completion(ReadLineState *rs, int nb_args, const char *str);

monitor.c

+7 −0
Original line number Diff line number Diff line
@@ -2921,6 +2921,13 @@ static mon_cmd_t info_cmds[] = { 
        .help       = "show memory backends",

        .mhandler.cmd = hmp_info_memdev,

    },

    {

        .name       = "memory-devices",

        .args_type  = "",

        .params     = "",

        .help       = "show memory devices",

        .mhandler.cmd = hmp_info_memory_devices,

    },

    {

        .name       = NULL,

    },