From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz6YF-0003Mz-E2 for qemu-devel@nongnu.org; Mon, 23 Jun 2014 11:53:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wz6Y7-0001Dm-Qm for qemu-devel@nongnu.org; Mon, 23 Jun 2014 11:52:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz6Y7-0001Dc-H7 for qemu-devel@nongnu.org; Mon, 23 Jun 2014 11:52:51 -0400 Date: Mon, 23 Jun 2014 18:53:10 +0300 From: "Michael S. Tsirkin" Message-ID: <1403538745-18622-4-git-send-email-mst@redhat.com> References: <1403538745-18622-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1403538745-18622-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 03/23] qapi/hmp: use 'backend' instead of 'device' with memory backend List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Markus Armbruster , Luiz Capitulino , Anthony Liguori , Igor Mammedov From: Igor Mammedov fixup documentation comments and HMP message/help text Signed-off-by: Igor Mammedov Reviewed-by: Eric Blake Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- qapi-schema.json | 12 +++++++----- hmp.c | 2 +- monitor.c | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 9835004..f490403 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 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, }, { -- MST