ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qmp: Include "reserve" property of memory backends 

Let's include the new property. Instead of relying on CONFIG_LINUX,
let's try to unconditionally grab the property and treat errors as
"does not exist".

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com> for memory backend and machine core
Cc: Eric Blake <eblake@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210510114328.21835-15-david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
David Hildenbrand 2021-05-10 13:43:27 +02:00 committed by Paolo Bonzini
parent 7428e7ba15
commit 69647f9d51
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/core/machine-qmp-cmds.c
View File

@ -157,6 +157,7 @@ void qmp_set_numa_node(NumaOptions *cmd, Error **errp)
static int query_memdev(Object *obj, void *opaque) static int query_memdev(Object *obj, void *opaque)
{ {
Error *err = NULL;
MemdevList **list = opaque; MemdevList **list = opaque;
Memdev *m; Memdev *m;
QObject *host_nodes; QObject *host_nodes;
@ -173,6 +174,12 @@ static int query_memdev(Object *obj, void *opaque)
m->dump = object_property_get_bool(obj, "dump", &error_abort); m->dump = object_property_get_bool(obj, "dump", &error_abort);
m->prealloc = object_property_get_bool(obj, "prealloc", &error_abort); m->prealloc = object_property_get_bool(obj, "prealloc", &error_abort);
m->share = object_property_get_bool(obj, "share", &error_abort); m->share = object_property_get_bool(obj, "share", &error_abort);
m->reserve = object_property_get_bool(obj, "reserve", &err);
if (err) {
error_free_or_abort(&err);
} else {
m->has_reserve = true;
}
m->policy = object_property_get_enum(obj, "policy", "HostMemPolicy", m->policy = object_property_get_enum(obj, "policy", "HostMemPolicy",
&error_abort); &error_abort);
host_nodes = object_property_get_qobject(obj, host_nodes = object_property_get_qobject(obj,

7
qapi/machine.json
View File

@ -798,6 +798,12 @@
# #
# @share: whether memory is private to QEMU or shared (since 6.1) # @share: whether memory is private to QEMU or shared (since 6.1)
# #
# @reserve: whether swap space (or huge pages) was reserved if applicable.
# This corresponds to the user configuration and not the actual
# behavior implemented in the OS to perform the reservation.
# For example, Linux will never reserve swap space for shared
# file mappings. (since 6.1)
#
# @host-nodes: host nodes for its memory policy # @host-nodes: host nodes for its memory policy
# #
# @policy: memory policy of memory backend # @policy: memory policy of memory backend
@ -812,6 +818,7 @@
'dump': 'bool', 'dump': 'bool',
'prealloc': 'bool', 'prealloc': 'bool',
'share': 'bool', 'share': 'bool',
'*reserve': 'bool',
'host-nodes': ['uint16'], 'host-nodes': ['uint16'],
'policy': 'HostMemPolicy' }} 'policy': 'HostMemPolicy' }}