From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58217) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwxOa-0000ZS-BL for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:42:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwxOV-0005Jt-NE for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:42:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwxOV-0005JZ-Ft for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:42:03 -0400 Date: Tue, 17 Jun 2014 20:41:43 +0300 From: "Michael S. Tsirkin" Message-ID: <1403021756-15960-89-git-send-email-mst@redhat.com> References: <1403021756-15960-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1403021756-15960-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 088/103] qmp: add query-memdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Hu Tao , Markus Armbruster , Luiz Capitulino , Anthony Liguori , Paolo Bonzini , Wanlong Gao From: Hu Tao Add qmp command query-memdev to query for information of memory devices Signed-off-by: Hu Tao Acked-by: Michael S. Tsirkin --- qapi-schema.json | 40 +++++++++++++++++++++++++++ numa.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++= ++++++ qmp-commands.hx | 38 +++++++++++++++++++++++++ 3 files changed, 162 insertions(+) diff --git a/qapi-schema.json b/qapi-schema.json index fa1b876..4c367d0 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4796,3 +4796,43 @@ ## { 'enum': 'HostMemPolicy', 'data': [ 'default', 'preferred', 'bind', 'interleave' ] } + +## +# @Memdev: +# +# Information of memory device +# +# @size: memory device size +# +# @merge: enables or disables memory merge support +# +# @dump: includes memory device'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 +# +# Since: 2.1 +## + +{ 'type': 'Memdev', + 'data': { + 'size': 'size', + 'merge': 'bool', + 'dump': 'bool', + 'prealloc': 'bool', + 'host-nodes': ['uint16'], + 'policy': 'HostMemPolicy' }} + +## +# @query-memdev: +# +# Returns information for all memory devices. +# +# Returns: a list of @Memdev. +# +# Since: 2.1 +## +{ 'command': 'query-memdev', 'returns': ['Memdev'] } diff --git a/numa.c b/numa.c index 711f682..eef0717 100644 --- a/numa.c +++ b/numa.c @@ -34,6 +34,7 @@ #include "qapi/qmp/qerror.h" #include "hw/boards.h" #include "sysemu/hostmem.h" +#include "qmp-commands.h" =20 QemuOptsList qemu_numa_opts =3D { .name =3D "numa", @@ -283,3 +284,86 @@ void memory_region_allocate_system_memory(MemoryRegi= on *mr, Object *owner, addr +=3D size; } } + +static int query_memdev(Object *obj, void *opaque) +{ + MemdevList **list =3D opaque; + Error *err =3D NULL; + + if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) { + MemdevList *m =3D g_malloc0(sizeof(*m)); + + m->value =3D g_malloc0(sizeof(*m->value)); + + m->value->size =3D object_property_get_int(obj, "size", + &err); + if (err) { + goto error; + } + + m->value->merge =3D object_property_get_bool(obj, "merge", + &err); + if (err) { + goto error; + } + + m->value->dump =3D object_property_get_bool(obj, "dump", + &err); + if (err) { + goto error; + } + + m->value->prealloc =3D object_property_get_bool(obj, + "prealloc", &err); + if (err) { + goto error; + } + + m->value->policy =3D object_property_get_enum(obj, + "policy", + HostMemPolicy_lookup= , + &err); + if (err) { + goto error; + } + + object_property_get_uint16List(obj, "host-nodes", + &m->value->host_nodes, &err); + if (err) { + goto error; + } + + m->next =3D *list; + *list =3D m; + } + + return 0; +error: + return -1; +} + +MemdevList *qmp_query_memdev(Error **errp) +{ + Object *obj; + MemdevList *list =3D NULL, *m; + + obj =3D object_resolve_path("/objects", NULL); + if (obj =3D=3D NULL) { + return NULL; + } + + if (object_child_foreach(obj, query_memdev, &list) !=3D 0) { + goto error; + } + + return list; + +error: + while (list) { + m =3D list; + list =3D list->next; + g_free(m->value); + g_free(m); + } + return NULL; +} diff --git a/qmp-commands.hx b/qmp-commands.hx index d8aa4ed..bb34cd8 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3572,3 +3572,41 @@ Example: } }=A0] } =20 EQMP + + { + .name =3D "query-memdev", + .args_type =3D "", + .mhandler.cmd_new =3D qmp_marshal_input_query_memdev, + }, + +SQMP +query-memdev +------------ + +Show memory devices information. + + +Example (1): + +-> { "execute": "query-memdev" } +<- { "return": [ + { + "size": 536870912, + "merge": false, + "dump": true, + "prealloc": false, + "host-nodes": [0, 1], + "policy": "bind" + }, + { + "size": 536870912, + "merge": false, + "dump": true, + "prealloc": true, + "host-nodes": [2, 3], + "policy": "preferred" + } + ] + } + +EQMP --=20 MST