[Qemu-devel] [PATCH] qapi/hmp: use 'backend' instead of 'device' with memory backend

[Qemu-devel] [PATCH] qapi/hmp: use 'backend' instead of 'device' with memory backend

[Igor Mammedov]

fixup documentation comments and HMP message/help text

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 PS: based on PCI tree
---
 hmp.c            |  2 +-
 monitor.c        |  2 +-
 qapi-schema.json | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/hmp.c b/hmp.c
index 41006f5..e183a79 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 c7f8797..8c17f89 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 9835004..473521b 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,14 @@
 ##
 # @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
-- 
1.9.3

Re: [Qemu-devel] [PATCH] qapi/hmp: use 'backend' instead of 'device' with memory backend

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 779 bytes --]

On 06/19/2014 07:37 AM, Igor Mammedov wrote:
> fixup documentation comments and HMP message/help text
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
>  PS: based on PCI tree
> ---
>  hmp.c            |  2 +-
>  monitor.c        |  2 +-
>  qapi-schema.json | 11 ++++++-----
>  3 files changed, 8 insertions(+), 7 deletions(-)
> 

>  # Since: 2.1
>  ##
>  { 'command': 'query-memdev', 'returns': ['Memdev'] }
> +
>  # @PCDIMMDeviceInfo:

Can you also add a ## lead-in to PCDIMMDeviceInfo? The rest of the file
is fairly consistent at:

##
# docs
##
{ ... }

With that line added,

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]