mirror of https://github.com/proxmox/mirror_qemu
qom: Drop convenience method object_property_get_uint16List()
qom/object.c provides object_property_get_TYPE() and object_property_set_TYPE() for a number of common types. These are all convenience wrappers around object_property_get_qobject() and object_property_set_qobject(). Except for object_property_get_uint16List(), which is unusual in two ways: * It bypasses object_property_get_qobject(). Fixable; the previous commit did it for object_property_get_enum()) * It stores the value through a parameter. Its contract claims it returns the value, like the other functions do. Also fixable. Fixing is not worthwhile, though: object_property_get_uint16List() has seen exactly one user in six years. Convert the lone user to do its job with the generic object_property_get_qobject(), and drop object_property_get_uint16List(). Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20200505152926.18877-6-armbru@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> [Commit message typo fixed]master
parent
b555f89fcb
commit
44a17fe05a
|
@ -11,9 +11,13 @@
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
|
#include "qapi/qapi-builtin-visit.h"
|
||||||
#include "qapi/qapi-commands-machine.h"
|
#include "qapi/qapi-commands-machine.h"
|
||||||
#include "qapi/qmp/qerror.h"
|
#include "qapi/qmp/qerror.h"
|
||||||
|
#include "qapi/qmp/qobject.h"
|
||||||
|
#include "qapi/qobject-input-visitor.h"
|
||||||
#include "qemu/main-loop.h"
|
#include "qemu/main-loop.h"
|
||||||
|
#include "qom/qom-qobject.h"
|
||||||
#include "sysemu/hostmem.h"
|
#include "sysemu/hostmem.h"
|
||||||
#include "sysemu/hw_accel.h"
|
#include "sysemu/hw_accel.h"
|
||||||
#include "sysemu/numa.h"
|
#include "sysemu/numa.h"
|
||||||
|
@ -303,6 +307,8 @@ static int query_memdev(Object *obj, void *opaque)
|
||||||
{
|
{
|
||||||
MemdevList **list = opaque;
|
MemdevList **list = opaque;
|
||||||
MemdevList *m = NULL;
|
MemdevList *m = NULL;
|
||||||
|
QObject *host_nodes;
|
||||||
|
Visitor *v;
|
||||||
|
|
||||||
if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) {
|
if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) {
|
||||||
m = g_malloc0(sizeof(*m));
|
m = g_malloc0(sizeof(*m));
|
||||||
|
@ -325,9 +331,13 @@ static int query_memdev(Object *obj, void *opaque)
|
||||||
"policy",
|
"policy",
|
||||||
"HostMemPolicy",
|
"HostMemPolicy",
|
||||||
&error_abort);
|
&error_abort);
|
||||||
object_property_get_uint16List(obj, "host-nodes",
|
host_nodes = object_property_get_qobject(obj,
|
||||||
&m->value->host_nodes,
|
"host-nodes",
|
||||||
&error_abort);
|
&error_abort);
|
||||||
|
v = qobject_input_visitor_new(host_nodes);
|
||||||
|
visit_type_uint16List(v, NULL, &m->value->host_nodes, &error_abort);
|
||||||
|
visit_free(v);
|
||||||
|
qobject_unref(host_nodes);
|
||||||
|
|
||||||
m->next = *list;
|
m->next = *list;
|
||||||
*list = m;
|
*list = m;
|
||||||
|
|
|
@ -1320,20 +1320,6 @@ uint64_t object_property_get_uint(Object *obj, const char *name,
|
||||||
int object_property_get_enum(Object *obj, const char *name,
|
int object_property_get_enum(Object *obj, const char *name,
|
||||||
const char *typename, Error **errp);
|
const char *typename, Error **errp);
|
||||||
|
|
||||||
/**
|
|
||||||
* object_property_get_uint16List:
|
|
||||||
* @obj: the object
|
|
||||||
* @name: the name of the property
|
|
||||||
* @list: the returned int list
|
|
||||||
* @errp: returns an error if this function fails
|
|
||||||
*
|
|
||||||
* Returns: the value of the property, converted to integers, or
|
|
||||||
* undefined if an error occurs (including when the property value is not
|
|
||||||
* an list of integers).
|
|
||||||
*/
|
|
||||||
void object_property_get_uint16List(Object *obj, const char *name,
|
|
||||||
uint16List **list, Error **errp);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* object_property_set:
|
* object_property_set:
|
||||||
* @obj: the object
|
* @obj: the object
|
||||||
|
|
23
qom/object.c
23
qom/object.c
|
@ -1550,29 +1550,6 @@ int object_property_get_enum(Object *obj, const char *name,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
void object_property_get_uint16List(Object *obj, const char *name,
|
|
||||||
uint16List **list, Error **errp)
|
|
||||||
{
|
|
||||||
Error *err = NULL;
|
|
||||||
Visitor *v;
|
|
||||||
char *str;
|
|
||||||
|
|
||||||
v = string_output_visitor_new(false, &str);
|
|
||||||
object_property_get(obj, v, name, &err);
|
|
||||||
if (err) {
|
|
||||||
error_propagate(errp, err);
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
visit_complete(v, &str);
|
|
||||||
visit_free(v);
|
|
||||||
v = string_input_visitor_new(str);
|
|
||||||
visit_type_uint16List(v, NULL, list, errp);
|
|
||||||
|
|
||||||
g_free(str);
|
|
||||||
out:
|
|
||||||
visit_free(v);
|
|
||||||
}
|
|
||||||
|
|
||||||
void object_property_parse(Object *obj, const char *string,
|
void object_property_parse(Object *obj, const char *string,
|
||||||
const char *name, Error **errp)
|
const char *name, Error **errp)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue