[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/23] qapi/hmp: use 'backend' instead of 'device' wi
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 03/23] qapi/hmp: use 'backend' instead of 'device' with memory backend |
Date: |
Mon, 23 Jun 2014 18:53:10 +0300 |
From: Igor Mammedov <address@hidden>
fixup documentation comments and HMP message/help text
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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
- [Qemu-devel] [PULL 00/23] pc,pci,vhost,net fixes, enhancements, Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 01/23] vhost: block migration if backend does not log memory, Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 02/23] vhost: fix resource leak in error handling, Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 03/23] qapi/hmp: use 'backend' instead of 'device' with memory backend,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 04/23] libqemustub: add more stubs for qemu-char, Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 05/23] qtest: fix qtest for vhost-user, Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 06/23] qtest: fix vhost-user-test unbalanced mutex locks, Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 08/23] e1000: improve auto-negotiation reporting via mii-tool, Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 07/23] e1000: emulate auto-negotiation during external link status change, Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 09/23] e1000: signal guest on successful link auto-negotiation, Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 10/23] e1000: move e1000_autoneg_timer() to after set_ics(), Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 11/23] e1000: factor out checking for auto-negotiation availability, Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 13/23] qemu-char: fix qemu_chr_fe_get_msgfd(), Michael S. Tsirkin, 2014/06/23
- [Qemu-devel] [PULL 12/23] qapi/string-output-visitor: fix human output, Michael S. Tsirkin, 2014/06/23