diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2014-06-19 16:14:43 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-23 17:37:59 +0300 |
| commit | 8f4e5ac3e27f832c09d5de274c84a7f22de0e4dd (patch) | |
| tree | 5ad81b3b4b992f037e19ba1c3d755b4861e70a83 | |
| parent | 8617343faae6ba7e916137c6c9e3ef22c00565d8 (diff) | |
| download | focaccia-qemu-8f4e5ac3e27f832c09d5de274c84a7f22de0e4dd.tar.gz focaccia-qemu-8f4e5ac3e27f832c09d5de274c84a7f22de0e4dd.zip | |
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>
| -rw-r--r-- | hmp.c | 2 | ||||
| -rw-r--r-- | monitor.c | 2 | ||||
| -rw-r--r-- | qapi-schema.json | 12 |
3 files changed, 9 insertions, 7 deletions
diff --git a/hmp.c b/hmp.c index 41006f5eef..e183a79b8a 100644 --- a/hmp.c +++ b/hmp.c @@ -1692,7 +1692,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) ov = string_output_visitor_new(false); visit_type_uint16List(string_output_get_visitor(ov), &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, " merge: %s\n", m->value->merge ? "true" : "false"); diff --git a/monitor.c b/monitor.c index c7f879713e..8c17f899b3 100644 --- a/monitor.c +++ b/monitor.c @@ -2968,7 +2968,7 @@ static mon_cmd_t info_cmds[] = { .name = "memdev", .args_type = "", .params = "", - .help = "show the memory device", + .help = "show memory backends", .mhandler.cmd = hmp_info_memdev, }, { diff --git a/qapi-schema.json b/qapi-schema.json index 98350048f6..f490403d81 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3158,19 +3158,19 @@ ## # @Memdev: # -# Information of memory device +# Information about memory backend # -# @size: memory device size +# @size: memory backend size # # @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 # # @host-nodes: host nodes for its memory policy # -# @policy: memory policy of memory device +# @policy: memory policy of memory backend # # Since: 2.1 ## @@ -3187,13 +3187,15 @@ ## # @query-memdev: # -# Returns information for all memory devices. +# Returns information for all memory backends. # # Returns: a list of @Memdev. # # Since: 2.1 ## { 'command': 'query-memdev', 'returns': ['Memdev'] } + +## # @PCDIMMDeviceInfo: # # PCDIMMDevice state information |