qapi/hmp: use 'backend' instead of 'device' with memory backend

fixup documentation comments and HMP message/help text

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2014-06-19 16:14:43 +02:00 committed by Michael S. Tsirkin
parent 8617343faa
commit 8f4e5ac3e2
3 changed files with 9 additions and 7 deletions

2
hmp.c
View File

@ -1692,7 +1692,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
ov = string_output_visitor_new(false); ov = string_output_visitor_new(false);
visit_type_uint16List(string_output_get_visitor(ov), visit_type_uint16List(string_output_get_visitor(ov),
&m->value->host_nodes, NULL, NULL); &m->value->host_nodes, NULL, NULL);
monitor_printf(mon, "memory device %d\n", i); monitor_printf(mon, "memory backend: %d\n", i);
monitor_printf(mon, " size: %" PRId64 "\n", m->value->size); monitor_printf(mon, " size: %" PRId64 "\n", m->value->size);
monitor_printf(mon, " merge: %s\n", monitor_printf(mon, " merge: %s\n",
m->value->merge ? "true" : "false"); m->value->merge ? "true" : "false");

View File

@ -2968,7 +2968,7 @@ static mon_cmd_t info_cmds[] = {
.name = "memdev", .name = "memdev",
.args_type = "", .args_type = "",
.params = "", .params = "",
.help = "show the memory device", .help = "show memory backends",
.mhandler.cmd = hmp_info_memdev, .mhandler.cmd = hmp_info_memdev,
}, },
{ {

View File

@ -3158,19 +3158,19 @@
## ##
# @Memdev: # @Memdev:
# #
# Information of memory device # Information about memory backend
# #
# @size: memory device size # @size: memory backend size
# #
# @merge: enables or disables memory merge support # @merge: enables or disables memory merge support
# #
# @dump: includes memory device's memory in a core dump or not # @dump: includes memory backend's memory in a core dump or not
# #
# @prealloc: enables or disables memory preallocation # @prealloc: enables or disables memory preallocation
# #
# @host-nodes: host nodes for its memory policy # @host-nodes: host nodes for its memory policy
# #
# @policy: memory policy of memory device # @policy: memory policy of memory backend
# #
# Since: 2.1 # Since: 2.1
## ##
@ -3187,13 +3187,15 @@
## ##
# @query-memdev: # @query-memdev:
# #
# Returns information for all memory devices. # Returns information for all memory backends.
# #
# Returns: a list of @Memdev. # Returns: a list of @Memdev.
# #
# Since: 2.1 # Since: 2.1
## ##
{ 'command': 'query-memdev', 'returns': ['Memdev'] } { 'command': 'query-memdev', 'returns': ['Memdev'] }
##
# @PCDIMMDeviceInfo: # @PCDIMMDeviceInfo:
# #
# PCDIMMDevice state information # PCDIMMDevice state information