2015-08-21 07:04:50 +00:00
|
|
|
/*
|
|
|
|
* QEMU Object Model
|
|
|
|
*
|
|
|
|
* Copyright IBM, Corp. 2011
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
|
|
* See the COPYING file in the top-level directory.
|
|
|
|
*/
|
|
|
|
|
2018-02-19 06:31:32 +00:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Backports commit da34e65cb4025728566d6504a99916f6e7e1dd6a from qemu
2018-02-22 04:05:15 +00:00
|
|
|
#include "qapi/error.h"
|
2015-08-21 07:04:50 +00:00
|
|
|
#include "qom/object.h"
|
2018-02-22 14:24:12 +00:00
|
|
|
#include "qemu/cutils.h"
|
2015-08-21 07:04:50 +00:00
|
|
|
#include "qapi/visitor.h"
|
|
|
|
#include "qapi-visit.h"
|
|
|
|
#include "qapi/string-input-visitor.h"
|
|
|
|
#include "qapi/qmp/qerror.h"
|
|
|
|
|
|
|
|
/* TODO: replace QObject with a simpler visitor to avoid a dependency
|
|
|
|
* of the QOM core on QObject? */
|
|
|
|
#include "qom/qom-qobject.h"
|
|
|
|
#include "qapi/qmp/qbool.h"
|
2018-03-03 22:43:24 +00:00
|
|
|
#include "qapi/qmp/qnum.h"
|
2015-08-21 07:04:50 +00:00
|
|
|
#include "qapi/qmp/qstring.h"
|
|
|
|
|
|
|
|
#include "uc_priv.h"
|
|
|
|
|
|
|
|
#define MAX_INTERFACES 32
|
|
|
|
|
|
|
|
typedef struct InterfaceImpl InterfaceImpl;
|
|
|
|
typedef struct TypeImpl TypeImpl;
|
|
|
|
|
|
|
|
struct InterfaceImpl
|
|
|
|
{
|
|
|
|
const char *typename;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct TypeImpl
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
const char *parent;
|
|
|
|
|
|
|
|
size_t class_size;
|
|
|
|
size_t instance_size;
|
|
|
|
void *instance_userdata;
|
|
|
|
|
|
|
|
void (*class_init)(struct uc_struct *uc, ObjectClass *klass, void *data);
|
|
|
|
void (*class_base_init)(ObjectClass *klass, void *data);
|
|
|
|
void (*class_finalize)(ObjectClass *klass, void *data);
|
|
|
|
|
|
|
|
void *class_data;
|
|
|
|
|
|
|
|
void (*instance_init)(struct uc_struct *uc, Object *obj, void *opaque);
|
|
|
|
void (*instance_post_init)(struct uc_struct *uc, Object *obj);
|
|
|
|
void (*instance_finalize)(struct uc_struct *uc, Object *obj, void *opaque);
|
|
|
|
|
|
|
|
bool abstract;
|
|
|
|
|
|
|
|
TypeImpl *parent_type;
|
|
|
|
ObjectClass *class;
|
|
|
|
|
|
|
|
int num_interfaces;
|
|
|
|
InterfaceImpl interfaces[MAX_INTERFACES];
|
|
|
|
};
|
|
|
|
|
|
|
|
static GHashTable *type_table_get(struct uc_struct *uc)
|
|
|
|
{
|
|
|
|
if (uc->type_table == NULL) {
|
|
|
|
uc->type_table = g_hash_table_new(g_str_hash, g_str_equal);
|
|
|
|
}
|
|
|
|
|
|
|
|
return uc->type_table;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void type_table_add(struct uc_struct *uc, TypeImpl *ti)
|
|
|
|
{
|
|
|
|
assert(!uc->enumerating_types);
|
|
|
|
g_hash_table_insert(type_table_get(uc), (void *)ti->name, ti);
|
|
|
|
}
|
|
|
|
|
|
|
|
static TypeImpl *type_table_lookup(struct uc_struct *uc, const char *name)
|
|
|
|
{
|
|
|
|
return g_hash_table_lookup(type_table_get(uc), name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static TypeImpl *type_new(struct uc_struct *uc, const TypeInfo *info)
|
|
|
|
{
|
|
|
|
TypeImpl *ti = g_malloc0(sizeof(*ti));
|
|
|
|
int i;
|
|
|
|
|
|
|
|
g_assert(info->name != NULL);
|
|
|
|
|
|
|
|
if (type_table_lookup(uc, info->name) != NULL) {
|
|
|
|
fprintf(stderr, "Registering `%s' which already exists\n", info->name);
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
ti->name = g_strdup(info->name);
|
|
|
|
ti->parent = g_strdup(info->parent);
|
|
|
|
|
|
|
|
ti->class_size = info->class_size;
|
|
|
|
ti->instance_size = info->instance_size;
|
|
|
|
|
|
|
|
ti->class_init = info->class_init;
|
|
|
|
ti->class_base_init = info->class_base_init;
|
|
|
|
ti->class_finalize = info->class_finalize;
|
|
|
|
ti->class_data = info->class_data;
|
|
|
|
|
|
|
|
ti->instance_userdata = info->instance_userdata;
|
|
|
|
ti->instance_init = info->instance_init;
|
|
|
|
ti->instance_post_init = info->instance_post_init;
|
|
|
|
ti->instance_finalize = info->instance_finalize;
|
|
|
|
|
|
|
|
ti->abstract = info->abstract;
|
|
|
|
|
|
|
|
for (i = 0; info->interfaces && info->interfaces[i].type; i++) {
|
|
|
|
ti->interfaces[i].typename = g_strdup(info->interfaces[i].type);
|
|
|
|
}
|
|
|
|
ti->num_interfaces = i;
|
|
|
|
|
|
|
|
return ti;
|
|
|
|
}
|
|
|
|
|
|
|
|
static TypeImpl *type_register_internal(struct uc_struct *uc, const TypeInfo *info)
|
|
|
|
{
|
|
|
|
TypeImpl *ti;
|
|
|
|
ti = type_new(uc, info);
|
|
|
|
|
|
|
|
type_table_add(uc, ti);
|
|
|
|
return ti;
|
|
|
|
}
|
|
|
|
|
|
|
|
TypeImpl *type_register(struct uc_struct *uc, const TypeInfo *info)
|
|
|
|
{
|
|
|
|
assert(info->parent);
|
|
|
|
return type_register_internal(uc, info);
|
|
|
|
}
|
|
|
|
|
|
|
|
TypeImpl *type_register_static(struct uc_struct *uc, const TypeInfo *info)
|
|
|
|
{
|
|
|
|
return type_register(uc, info);
|
|
|
|
}
|
|
|
|
|
2018-03-05 08:49:38 +00:00
|
|
|
void type_register_static_array(struct uc_struct *uc, const TypeInfo *infos, int nr_infos)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < nr_infos; i++) {
|
|
|
|
type_register_static(uc, &infos[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-21 07:04:50 +00:00
|
|
|
static TypeImpl *type_get_by_name(struct uc_struct *uc, const char *name)
|
|
|
|
{
|
|
|
|
if (name == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return type_table_lookup(uc, name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static TypeImpl *type_get_parent(struct uc_struct *uc, TypeImpl *type)
|
|
|
|
{
|
|
|
|
if (!type->parent_type && type->parent) {
|
|
|
|
type->parent_type = type_get_by_name(uc, type->parent);
|
|
|
|
g_assert(type->parent_type != NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
return type->parent_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool type_has_parent(TypeImpl *type)
|
|
|
|
{
|
|
|
|
return (type->parent != NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t type_class_get_size(struct uc_struct *uc, TypeImpl *ti)
|
|
|
|
{
|
|
|
|
if (ti->class_size) {
|
|
|
|
return ti->class_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type_has_parent(ti)) {
|
|
|
|
return type_class_get_size(uc, type_get_parent(uc, ti));
|
|
|
|
}
|
|
|
|
|
|
|
|
return sizeof(ObjectClass);
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t type_object_get_size(struct uc_struct *uc, TypeImpl *ti)
|
|
|
|
{
|
|
|
|
if (ti->instance_size) {
|
|
|
|
return ti->instance_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type_has_parent(ti)) {
|
|
|
|
return type_object_get_size(uc, type_get_parent(uc, ti));
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-02-24 23:59:25 +00:00
|
|
|
size_t object_type_get_instance_size(struct uc_struct *uc, const char *typename)
|
|
|
|
{
|
|
|
|
TypeImpl *type = type_get_by_name(uc, typename);
|
|
|
|
|
|
|
|
g_assert(type != NULL);
|
|
|
|
return type_object_get_size(uc, type);
|
|
|
|
}
|
|
|
|
|
2015-08-21 07:04:50 +00:00
|
|
|
static bool type_is_ancestor(struct uc_struct *uc, TypeImpl *type, TypeImpl *target_type)
|
|
|
|
{
|
|
|
|
assert(target_type);
|
|
|
|
|
2018-02-17 20:38:06 +00:00
|
|
|
/* Check if target_type is a direct ancestor of type */
|
2015-08-21 07:04:50 +00:00
|
|
|
while (type) {
|
|
|
|
if (type == target_type) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
type = type_get_parent(uc, type);
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void type_initialize(struct uc_struct *uc, TypeImpl *ti);
|
|
|
|
|
|
|
|
static void type_initialize_interface(struct uc_struct *uc, TypeImpl *ti, TypeImpl *interface_type,
|
|
|
|
TypeImpl *parent_type)
|
|
|
|
{
|
|
|
|
InterfaceClass *new_iface;
|
2017-01-19 11:50:28 +00:00
|
|
|
TypeInfo info = { 0 };
|
2015-08-21 07:04:50 +00:00
|
|
|
TypeImpl *iface_impl;
|
|
|
|
|
|
|
|
info.parent = parent_type->name;
|
|
|
|
info.name = g_strdup_printf("%s::%s", ti->name, interface_type->name);
|
|
|
|
info.abstract = true;
|
|
|
|
|
|
|
|
iface_impl = type_new(uc, &info);
|
|
|
|
iface_impl->parent_type = parent_type;
|
|
|
|
type_initialize(uc, iface_impl);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free((char *)info.name);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
new_iface = (InterfaceClass *)iface_impl->class;
|
|
|
|
new_iface->concrete_class = ti->class;
|
|
|
|
new_iface->interface_type = interface_type;
|
|
|
|
|
|
|
|
ti->class->interfaces = g_slist_append(ti->class->interfaces,
|
|
|
|
iface_impl->class);
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
static void object_property_free(gpointer data)
|
|
|
|
{
|
|
|
|
ObjectProperty *prop = data;
|
|
|
|
|
|
|
|
g_free(prop->name);
|
|
|
|
g_free(prop->type);
|
|
|
|
g_free(prop->description);
|
|
|
|
g_free(prop);
|
|
|
|
}
|
|
|
|
|
2015-08-21 07:04:50 +00:00
|
|
|
static void type_initialize(struct uc_struct *uc, TypeImpl *ti)
|
|
|
|
{
|
|
|
|
TypeImpl *parent;
|
|
|
|
|
|
|
|
if (ti->class) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ti->class_size = type_class_get_size(uc, ti);
|
|
|
|
ti->instance_size = type_object_get_size(uc, ti);
|
|
|
|
|
|
|
|
ti->class = g_malloc0(ti->class_size);
|
|
|
|
|
|
|
|
parent = type_get_parent(uc, ti);
|
|
|
|
if (parent) {
|
|
|
|
GSList *e;
|
|
|
|
int i;
|
2017-01-19 11:50:28 +00:00
|
|
|
type_initialize(uc, parent);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
g_assert(parent->class_size <= ti->class_size);
|
|
|
|
memcpy(ti->class, parent->class, parent->class_size);
|
|
|
|
ti->class->interfaces = NULL;
|
2018-02-21 18:58:46 +00:00
|
|
|
ti->class->properties = g_hash_table_new_full(
|
|
|
|
g_str_hash, g_str_equal, g_free, object_property_free);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
for (e = parent->class->interfaces; e; e = e->next) {
|
|
|
|
InterfaceClass *iface = e->data;
|
|
|
|
ObjectClass *klass = OBJECT_CLASS(iface);
|
|
|
|
|
|
|
|
type_initialize_interface(uc, ti, iface->interface_type, klass->type);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < ti->num_interfaces; i++) {
|
|
|
|
TypeImpl *t = type_get_by_name(uc, ti->interfaces[i].typename);
|
|
|
|
for (e = ti->class->interfaces; e; e = e->next) {
|
|
|
|
TypeImpl *target_type = OBJECT_CLASS(e->data)->type;
|
|
|
|
|
|
|
|
if (type_is_ancestor(uc, target_type, t)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (e) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
type_initialize_interface(uc, ti, t, t);
|
|
|
|
}
|
2018-02-21 18:58:46 +00:00
|
|
|
} else {
|
|
|
|
ti->class->properties = g_hash_table_new_full(
|
|
|
|
g_str_hash, g_str_equal, g_free, object_property_free);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ti->class->type = ti;
|
|
|
|
|
|
|
|
while (parent) {
|
|
|
|
if (parent->class_base_init) {
|
|
|
|
parent->class_base_init(ti->class, ti->class_data);
|
|
|
|
}
|
|
|
|
parent = type_get_parent(uc, parent);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ti->class_init) {
|
|
|
|
ti->class_init(uc, ti->class, ti->class_data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void object_init_with_type(struct uc_struct *uc, Object *obj, TypeImpl *ti)
|
|
|
|
{
|
|
|
|
if (type_has_parent(ti)) {
|
|
|
|
object_init_with_type(uc, obj, type_get_parent(uc, ti));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ti->instance_init) {
|
|
|
|
ti->instance_init(uc, obj, ti->instance_userdata);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void object_post_init_with_type(struct uc_struct *uc, Object *obj, TypeImpl *ti)
|
|
|
|
{
|
|
|
|
if (ti->instance_post_init) {
|
|
|
|
ti->instance_post_init(uc, obj);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type_has_parent(ti)) {
|
|
|
|
object_post_init_with_type(uc, obj, type_get_parent(uc, ti));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void object_initialize_with_type(struct uc_struct *uc, void *data, size_t size, TypeImpl *type)
|
|
|
|
{
|
|
|
|
Object *obj = data;
|
|
|
|
|
|
|
|
g_assert(type != NULL);
|
|
|
|
type_initialize(uc, type);
|
|
|
|
|
|
|
|
g_assert(type->instance_size >= sizeof(Object));
|
|
|
|
g_assert(type->abstract == false);
|
|
|
|
g_assert(size >= type->instance_size);
|
|
|
|
|
|
|
|
memset(obj, 0, type->instance_size);
|
|
|
|
obj->class = type->class;
|
|
|
|
object_ref(obj);
|
2018-02-21 18:33:58 +00:00
|
|
|
obj->properties = g_hash_table_new_full(g_str_hash, g_str_equal,
|
|
|
|
NULL, object_property_free);
|
2015-08-21 07:04:50 +00:00
|
|
|
object_init_with_type(uc, obj, type);
|
|
|
|
object_post_init_with_type(uc, obj, type);
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_initialize(struct uc_struct *uc, void *data, size_t size, const char *typename)
|
|
|
|
{
|
|
|
|
TypeImpl *type = type_get_by_name(uc, typename);
|
|
|
|
|
|
|
|
object_initialize_with_type(uc, data, size, type);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool object_property_is_child(ObjectProperty *prop)
|
|
|
|
{
|
|
|
|
return strstart(prop->type, "child<", NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void object_property_del_all(struct uc_struct *uc, Object *obj)
|
|
|
|
{
|
2018-02-21 18:33:58 +00:00
|
|
|
ObjectProperty *prop;
|
|
|
|
GHashTableIter iter;
|
|
|
|
gpointer key, value;
|
|
|
|
bool released;
|
|
|
|
|
|
|
|
do {
|
|
|
|
released = false;
|
|
|
|
g_hash_table_iter_init(&iter, obj->properties);
|
|
|
|
while (g_hash_table_iter_next(&iter, &key, &value)) {
|
|
|
|
prop = value;
|
|
|
|
if (prop->release) {
|
|
|
|
prop->release(uc, obj, prop->name, prop->opaque);
|
|
|
|
prop->release = NULL;
|
|
|
|
released = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
g_hash_table_iter_remove(&iter);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
2018-02-21 18:33:58 +00:00
|
|
|
} while (released);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-21 18:33:58 +00:00
|
|
|
g_hash_table_unref(obj->properties);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2016-10-20 10:33:37 +00:00
|
|
|
void object_property_del_child(struct uc_struct *uc, Object *obj, Object *child, Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
ObjectProperty *prop;
|
2018-02-21 18:33:58 +00:00
|
|
|
GHashTableIter iter;
|
|
|
|
gpointer key, value;
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-21 18:33:58 +00:00
|
|
|
g_hash_table_iter_init(&iter, obj->properties);
|
|
|
|
while (g_hash_table_iter_next(&iter, &key, &value)) {
|
|
|
|
prop = value;
|
|
|
|
if (object_property_is_child(prop) && prop->opaque == child) {
|
|
|
|
if (prop->release) {
|
|
|
|
prop->release(uc, obj, prop->name, prop->opaque);
|
|
|
|
prop->release = NULL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
g_hash_table_iter_init(&iter, obj->properties);
|
|
|
|
while (g_hash_table_iter_next(&iter, &key, &value)) {
|
|
|
|
prop = value;
|
2015-08-21 07:04:50 +00:00
|
|
|
if (object_property_is_child(prop) && prop->opaque == child) {
|
2018-02-21 18:33:58 +00:00
|
|
|
g_hash_table_iter_remove(&iter);
|
2015-08-21 07:04:50 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_unparent(struct uc_struct *uc, Object *obj)
|
|
|
|
{
|
|
|
|
if (obj->parent) {
|
|
|
|
object_property_del_child(uc, obj->parent, obj, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void object_deinit(struct uc_struct *uc, Object *obj, TypeImpl *type)
|
|
|
|
{
|
|
|
|
if (type->instance_finalize) {
|
|
|
|
type->instance_finalize(uc, obj, type->instance_userdata);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type_has_parent(type)) {
|
|
|
|
object_deinit(uc, obj, type_get_parent(uc, type));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void object_finalize(struct uc_struct *uc, void *data)
|
|
|
|
{
|
|
|
|
Object *obj = data;
|
|
|
|
TypeImpl *ti = obj->class->type;
|
|
|
|
|
|
|
|
object_property_del_all(uc, obj);
|
|
|
|
object_deinit(uc, obj, ti);
|
|
|
|
|
|
|
|
g_assert(obj->ref == 0);
|
|
|
|
if (obj->free) {
|
|
|
|
obj->free(obj);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static Object *object_new_with_type(struct uc_struct *uc, Type type)
|
|
|
|
{
|
|
|
|
Object *obj;
|
|
|
|
|
|
|
|
g_assert(type != NULL);
|
|
|
|
type_initialize(uc, type);
|
|
|
|
|
|
|
|
obj = g_malloc(type->instance_size);
|
|
|
|
object_initialize_with_type(uc, obj, type->instance_size, type);
|
2016-12-21 14:28:36 +00:00
|
|
|
obj->free = g_free;
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
Object *object_new(struct uc_struct *uc, const char *typename)
|
|
|
|
{
|
|
|
|
TypeImpl *ti = type_get_by_name(uc, typename);
|
|
|
|
|
|
|
|
return object_new_with_type(uc, ti);
|
|
|
|
}
|
|
|
|
|
|
|
|
Object *object_dynamic_cast(struct uc_struct *uc, Object *obj, const char *typename)
|
|
|
|
{
|
|
|
|
if (obj && object_class_dynamic_cast(uc, object_get_class(obj), typename)) {
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
Object *object_dynamic_cast_assert(struct uc_struct *uc, Object *obj, const char *typename,
|
|
|
|
const char *file, int line, const char *func)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_QOM_CAST_DEBUG
|
|
|
|
int i;
|
|
|
|
Object *inst;
|
|
|
|
|
|
|
|
for (i = 0; obj && i < OBJECT_CLASS_CAST_CACHE; i++) {
|
2018-02-26 10:06:37 +00:00
|
|
|
if (atomic_read(&obj->class->object_cast_cache[i]) == typename) {
|
2015-08-21 07:04:50 +00:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
inst = object_dynamic_cast(uc, obj, typename);
|
|
|
|
|
|
|
|
if (!inst && obj) {
|
|
|
|
fprintf(stderr, "%s:%d:%s: Object %p is not an instance of type %s\n",
|
|
|
|
file, line, func, obj, typename);
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(obj == inst);
|
|
|
|
|
|
|
|
if (obj && obj == inst) {
|
|
|
|
for (i = 1; i < OBJECT_CLASS_CAST_CACHE; i++) {
|
2018-02-26 10:06:37 +00:00
|
|
|
atomic_set(&obj->class->object_cast_cache[i - 1],
|
|
|
|
atomic_read(&obj->class->object_cast_cache[i]));
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
2018-02-26 10:06:37 +00:00
|
|
|
atomic_set(&obj->class->object_cast_cache[i - 1], typename);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
#endif
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
ObjectClass *object_class_dynamic_cast(struct uc_struct *uc, ObjectClass *class,
|
|
|
|
const char *typename)
|
|
|
|
{
|
|
|
|
ObjectClass *ret = NULL;
|
|
|
|
TypeImpl *target_type;
|
|
|
|
TypeImpl *type;
|
|
|
|
|
|
|
|
if (!class) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* A simple fast path that can trigger a lot for leaf classes. */
|
|
|
|
type = class->type;
|
|
|
|
if (type->name == typename) {
|
|
|
|
return class;
|
|
|
|
}
|
|
|
|
|
|
|
|
target_type = type_get_by_name(uc, typename);
|
|
|
|
if (!target_type) {
|
|
|
|
/* target class type unknown, so fail the cast */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type->class->interfaces &&
|
|
|
|
type_is_ancestor(uc, target_type, uc->type_interface)) {
|
|
|
|
int found = 0;
|
|
|
|
GSList *i;
|
|
|
|
|
|
|
|
for (i = class->interfaces; i; i = i->next) {
|
|
|
|
ObjectClass *target_class = i->data;
|
|
|
|
|
|
|
|
if (type_is_ancestor(uc, target_class->type, target_type)) {
|
|
|
|
ret = target_class;
|
|
|
|
found++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The match was ambiguous, don't allow a cast */
|
|
|
|
if (found > 1) {
|
|
|
|
ret = NULL;
|
|
|
|
}
|
|
|
|
} else if (type_is_ancestor(uc, type, target_type)) {
|
|
|
|
ret = class;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
ObjectClass *object_class_dynamic_cast_assert(struct uc_struct *uc, ObjectClass *class,
|
|
|
|
const char *typename,
|
|
|
|
const char *file, int line,
|
|
|
|
const char *func)
|
|
|
|
{
|
|
|
|
ObjectClass *ret;
|
|
|
|
|
|
|
|
#ifdef CONFIG_QOM_CAST_DEBUG
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; class && i < OBJECT_CLASS_CAST_CACHE; i++) {
|
2018-02-26 10:06:37 +00:00
|
|
|
if (atomic_read(&class->class_cast_cache[i]) == typename) {
|
2015-08-21 07:04:50 +00:00
|
|
|
ret = class;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
if (!class || !class->interfaces) {
|
|
|
|
return class;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
ret = object_class_dynamic_cast(uc, class, typename);
|
|
|
|
if (!ret && class) {
|
|
|
|
fprintf(stderr, "%s:%d:%s: Object %p is not an instance of type %s\n",
|
|
|
|
file, line, func, class, typename);
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_QOM_CAST_DEBUG
|
|
|
|
if (class && ret == class) {
|
|
|
|
for (i = 1; i < OBJECT_CLASS_CAST_CACHE; i++) {
|
2018-02-26 10:06:37 +00:00
|
|
|
atomic_set(&class->class_cast_cache[i - 1],
|
|
|
|
atomic_read(&class->class_cast_cache[i]));
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
2018-02-26 10:06:37 +00:00
|
|
|
atomic_set(&class->class_cast_cache[i - 1], typename);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
out:
|
|
|
|
#endif
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-03-04 03:17:13 +00:00
|
|
|
const char *object_get_typename(const Object *obj)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
return obj->class->type->name;
|
|
|
|
}
|
|
|
|
|
|
|
|
ObjectClass *object_get_class(Object *obj)
|
|
|
|
{
|
|
|
|
return obj->class;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool object_class_is_abstract(ObjectClass *klass)
|
|
|
|
{
|
|
|
|
return klass->type->abstract;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *object_class_get_name(ObjectClass *klass)
|
|
|
|
{
|
|
|
|
return klass->type->name;
|
|
|
|
}
|
|
|
|
|
|
|
|
ObjectClass *object_class_by_name(struct uc_struct *uc, const char *typename)
|
|
|
|
{
|
|
|
|
TypeImpl *type = type_get_by_name(uc, typename);
|
|
|
|
|
|
|
|
if (!type) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
type_initialize(uc, type);
|
|
|
|
|
|
|
|
return type->class;
|
|
|
|
}
|
|
|
|
|
|
|
|
ObjectClass *object_class_get_parent(struct uc_struct *uc, ObjectClass *class)
|
|
|
|
{
|
|
|
|
TypeImpl *type = type_get_parent(uc, class->type);
|
|
|
|
|
|
|
|
if (!type) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
type_initialize(uc, type);
|
|
|
|
|
|
|
|
return type->class;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct OCFData
|
|
|
|
{
|
|
|
|
void (*fn)(ObjectClass *klass, void *opaque);
|
|
|
|
const char *implements_type;
|
|
|
|
bool include_abstract;
|
|
|
|
void *opaque;
|
|
|
|
struct uc_struct *uc;
|
|
|
|
} OCFData;
|
|
|
|
|
|
|
|
static void object_class_foreach_tramp(gpointer key, gpointer value,
|
|
|
|
gpointer opaque)
|
|
|
|
{
|
|
|
|
OCFData *data = opaque;
|
|
|
|
TypeImpl *type = value;
|
|
|
|
ObjectClass *k;
|
|
|
|
|
|
|
|
type_initialize(data->uc, type);
|
|
|
|
k = type->class;
|
|
|
|
|
|
|
|
if (!data->include_abstract && type->abstract) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->implements_type &&
|
|
|
|
!object_class_dynamic_cast(data->uc, k, data->implements_type)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
data->fn(k, data->opaque);
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_class_foreach(struct uc_struct *uc, void (*fn)(ObjectClass *klass, void *opaque),
|
|
|
|
const char *implements_type, bool include_abstract,
|
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
OCFData data = { fn, implements_type, include_abstract, opaque, uc };
|
|
|
|
|
|
|
|
uc->enumerating_types = true;
|
|
|
|
g_hash_table_foreach(type_table_get(uc), object_class_foreach_tramp, &data);
|
|
|
|
uc->enumerating_types = false;
|
|
|
|
}
|
|
|
|
|
2018-02-15 16:13:21 +00:00
|
|
|
static int do_object_child_foreach(Object *obj,
|
|
|
|
int (*fn)(Object *child, void *opaque),
|
|
|
|
void *opaque, bool recurse)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-21 18:33:58 +00:00
|
|
|
GHashTableIter iter;
|
|
|
|
ObjectProperty *prop;
|
2015-08-21 07:04:50 +00:00
|
|
|
int ret = 0;
|
|
|
|
|
2018-02-21 18:33:58 +00:00
|
|
|
g_hash_table_iter_init(&iter, obj->properties);
|
|
|
|
while (g_hash_table_iter_next(&iter, NULL, (gpointer *)&prop)) {
|
2015-08-21 07:04:50 +00:00
|
|
|
if (object_property_is_child(prop)) {
|
2018-02-15 16:13:21 +00:00
|
|
|
Object *child = prop->opaque;
|
|
|
|
|
|
|
|
ret = fn(child, opaque);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (ret != 0) {
|
|
|
|
break;
|
|
|
|
}
|
2018-02-15 16:13:21 +00:00
|
|
|
if (recurse) {
|
|
|
|
do_object_child_foreach(child, fn, opaque, true);
|
|
|
|
}
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-02-15 16:13:21 +00:00
|
|
|
int object_child_foreach(Object *obj, int (*fn)(Object *child, void *opaque),
|
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
return do_object_child_foreach(obj, fn, opaque, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
int object_child_foreach_recursive(Object *obj,
|
|
|
|
int (*fn)(Object *child, void *opaque),
|
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
return do_object_child_foreach(obj, fn, opaque, true);
|
|
|
|
}
|
|
|
|
|
2015-08-21 07:04:50 +00:00
|
|
|
static void object_class_get_list_tramp(ObjectClass *klass, void *opaque)
|
|
|
|
{
|
|
|
|
GSList **list = opaque;
|
|
|
|
|
|
|
|
*list = g_slist_prepend(*list, klass);
|
|
|
|
}
|
|
|
|
|
|
|
|
GSList *object_class_get_list(struct uc_struct *uc, const char *implements_type,
|
|
|
|
bool include_abstract)
|
|
|
|
{
|
|
|
|
GSList *list = NULL;
|
|
|
|
|
|
|
|
object_class_foreach(uc, object_class_get_list_tramp,
|
|
|
|
implements_type, include_abstract, &list);
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_ref(Object *obj)
|
|
|
|
{
|
|
|
|
if (!obj) {
|
|
|
|
return;
|
|
|
|
}
|
2015-10-27 17:26:59 +00:00
|
|
|
atomic_inc(&obj->ref);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void object_unref(struct uc_struct *uc, Object *obj)
|
|
|
|
{
|
|
|
|
if (!obj) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
g_assert(obj->ref > 0);
|
|
|
|
|
|
|
|
/* parent always holds a reference to its children */
|
|
|
|
if (atomic_fetch_dec(&obj->ref) == 1) {
|
|
|
|
object_finalize(uc, obj);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ObjectProperty *
|
2018-02-21 18:58:46 +00:00
|
|
|
object_property_add(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, const char *type,
|
2015-08-21 07:04:50 +00:00
|
|
|
ObjectPropertyAccessor *get,
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
ObjectPropertyAccessor *set,
|
2015-08-21 07:04:50 +00:00
|
|
|
ObjectPropertyRelease *release,
|
|
|
|
void *opaque, Error **errp)
|
|
|
|
{
|
|
|
|
ObjectProperty *prop;
|
|
|
|
size_t name_len = strlen(name);
|
|
|
|
|
|
|
|
if (name_len >= 3 && !memcmp(name + name_len - 3, "[*]", 4)) {
|
|
|
|
int i;
|
|
|
|
ObjectProperty *ret;
|
|
|
|
char *name_no_array = g_strdup(name);
|
|
|
|
|
|
|
|
name_no_array[name_len - 3] = '\0';
|
|
|
|
for (i = 0; ; ++i) {
|
|
|
|
char *full_name = g_strdup_printf("%s[%d]", name_no_array, i);
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
ret = object_property_add(uc, obj, full_name, type, get, set,
|
2015-08-21 07:04:50 +00:00
|
|
|
release, opaque, NULL);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(full_name);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (ret) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(name_no_array);
|
2015-08-21 07:04:50 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
if (object_property_find(uc, obj, name, NULL) != NULL) {
|
2018-02-21 18:33:58 +00:00
|
|
|
error_setg(errp, "attempt to add duplicate property '%s'"
|
2018-02-21 18:58:46 +00:00
|
|
|
" to object (type '%s')", name,
|
|
|
|
object_get_typename(obj));
|
2018-02-21 18:33:58 +00:00
|
|
|
return NULL;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
prop = g_malloc0(sizeof(*prop));
|
|
|
|
|
|
|
|
prop->name = g_strdup(name);
|
|
|
|
prop->type = g_strdup(type);
|
|
|
|
|
|
|
|
prop->get = get;
|
|
|
|
prop->set = set;
|
|
|
|
prop->release = release;
|
|
|
|
prop->opaque = opaque;
|
|
|
|
|
2018-02-21 18:33:58 +00:00
|
|
|
g_hash_table_insert(obj->properties, prop->name, prop);
|
2015-08-21 07:04:50 +00:00
|
|
|
return prop;
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
ObjectProperty *
|
|
|
|
object_class_property_add(struct uc_struct *uc,
|
|
|
|
ObjectClass *klass,
|
|
|
|
const char *name,
|
|
|
|
const char *type,
|
|
|
|
ObjectPropertyAccessor *get,
|
|
|
|
ObjectPropertyAccessor *set,
|
|
|
|
ObjectPropertyRelease *release,
|
|
|
|
void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
ObjectProperty *prop;
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
if (object_class_property_find(uc, klass, name, NULL) != NULL) {
|
|
|
|
error_setg(errp, "attempt to add duplicate property '%s'"
|
|
|
|
" to object (type '%s')", name,
|
|
|
|
object_class_get_name(klass));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
prop = g_malloc0(sizeof(*prop));
|
|
|
|
|
|
|
|
prop->name = g_strdup(name);
|
|
|
|
prop->type = g_strdup(type);
|
|
|
|
|
|
|
|
prop->get = get;
|
|
|
|
prop->set = set;
|
|
|
|
prop->release = release;
|
|
|
|
prop->opaque = opaque;
|
|
|
|
|
|
|
|
g_hash_table_insert(klass->properties, g_strdup(name), prop);
|
|
|
|
|
|
|
|
return prop;
|
|
|
|
}
|
|
|
|
|
|
|
|
ObjectProperty *object_property_find(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
ObjectProperty *prop;
|
|
|
|
ObjectClass *klass = object_get_class(obj);
|
|
|
|
|
|
|
|
prop = object_class_property_find(uc, klass, name, NULL);
|
|
|
|
if (prop) {
|
|
|
|
return prop;
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:33:58 +00:00
|
|
|
prop = g_hash_table_lookup(obj->properties, name);
|
|
|
|
if (prop) {
|
|
|
|
return prop;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
error_setg(errp, "Property '.%s' not found", name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2018-02-22 02:03:44 +00:00
|
|
|
void object_property_iter_init(ObjectPropertyIterator *iter,
|
|
|
|
Object *obj)
|
2018-02-17 23:38:49 +00:00
|
|
|
{
|
2018-02-22 02:03:44 +00:00
|
|
|
g_hash_table_iter_init(&iter->iter, obj->properties);
|
|
|
|
iter->nextclass = object_get_class(obj);
|
2018-02-17 23:38:49 +00:00
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
ObjectProperty *object_property_iter_next(struct uc_struct *uc, ObjectPropertyIterator *iter)
|
2018-02-17 23:38:49 +00:00
|
|
|
{
|
2018-02-21 18:33:58 +00:00
|
|
|
gpointer key, val;
|
2018-02-21 18:58:46 +00:00
|
|
|
while (!g_hash_table_iter_next(&iter->iter, &key, &val)) {
|
|
|
|
if (!iter->nextclass) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
g_hash_table_iter_init(&iter->iter, iter->nextclass->properties);
|
|
|
|
iter->nextclass = object_class_get_parent(uc, iter->nextclass);
|
2018-02-17 23:38:49 +00:00
|
|
|
}
|
2018-02-21 18:33:58 +00:00
|
|
|
return val;
|
2018-02-17 23:38:49 +00:00
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
ObjectProperty *object_class_property_find(struct uc_struct *uc, ObjectClass *klass,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
ObjectProperty *prop;
|
|
|
|
ObjectClass *parent_klass;
|
|
|
|
|
|
|
|
parent_klass = object_class_get_parent(uc, klass);
|
|
|
|
if (parent_klass) {
|
|
|
|
prop = object_class_property_find(uc, parent_klass, name, NULL);
|
|
|
|
if (prop) {
|
|
|
|
return prop;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
prop = g_hash_table_lookup(klass->properties, name);
|
|
|
|
if (!prop) {
|
|
|
|
error_setg(errp, "Property '.%s' not found", name);
|
|
|
|
}
|
|
|
|
return prop;
|
|
|
|
}
|
|
|
|
|
2015-08-21 07:04:50 +00:00
|
|
|
void object_property_del(struct uc_struct *uc, Object *obj, const char *name, Error **errp)
|
|
|
|
{
|
2018-02-21 18:33:58 +00:00
|
|
|
ObjectProperty *prop = g_hash_table_lookup(obj->properties, name);
|
|
|
|
|
|
|
|
if (!prop) {
|
|
|
|
error_setg(errp, "Property '.%s' not found", name);
|
2015-08-21 07:04:50 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prop->release) {
|
|
|
|
prop->release(uc, obj, name, prop->opaque);
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:33:58 +00:00
|
|
|
g_hash_table_remove(obj->properties, name);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_property_get(struct uc_struct *uc, Object *obj, Visitor *v,
|
|
|
|
const char *name, Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-21 18:58:46 +00:00
|
|
|
ObjectProperty *prop = object_property_find(uc, obj, name, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (prop == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!prop->get) {
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_PERMISSION_DENIED);
|
2015-08-21 07:04:50 +00:00
|
|
|
} else {
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
prop->get(uc, obj, v, name, prop->opaque, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_property_set(struct uc_struct *uc, Object *obj, Visitor *v,
|
|
|
|
const char *name, Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-21 18:58:46 +00:00
|
|
|
ObjectProperty *prop = object_property_find(uc, obj, name, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (prop == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!prop->set) {
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_PERMISSION_DENIED);
|
2015-08-21 07:04:50 +00:00
|
|
|
} else {
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
prop->set(uc, obj, v, name, prop->opaque, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_property_set_str(struct uc_struct *uc, Object *obj, const char *value,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
QString *qstr = qstring_from_str(value);
|
|
|
|
object_property_set_qobject(uc, obj, QOBJECT(qstr), name, errp);
|
|
|
|
|
|
|
|
QDECREF(qstr);
|
|
|
|
}
|
|
|
|
|
|
|
|
char *object_property_get_str(struct uc_struct *uc, Object *obj, const char *name,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QObject *ret = object_property_get_qobject(uc, obj, name, errp);
|
|
|
|
QString *qstring;
|
|
|
|
char *retval;
|
|
|
|
|
|
|
|
if (!ret) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
qstring = qobject_to_qstring(ret);
|
|
|
|
if (!qstring) {
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "string");
|
2015-08-21 07:04:50 +00:00
|
|
|
retval = NULL;
|
|
|
|
} else {
|
|
|
|
retval = g_strdup(qstring_get_str(qstring));
|
|
|
|
}
|
|
|
|
|
2018-03-03 22:22:22 +00:00
|
|
|
qobject_decref(ret);
|
2015-08-21 07:04:50 +00:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_property_set_link(struct uc_struct *uc, Object *obj, Object *value,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
if (value) {
|
|
|
|
gchar *path = object_get_canonical_path(value);
|
|
|
|
object_property_set_str(uc, obj, path, name, errp);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(path);
|
2015-08-21 07:04:50 +00:00
|
|
|
} else {
|
|
|
|
object_property_set_str(uc, obj, "", name, errp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Object *object_property_get_link(struct uc_struct *uc, Object *obj, const char *name,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
char *str = object_property_get_str(uc, obj, name, errp);
|
|
|
|
Object *target = NULL;
|
|
|
|
|
|
|
|
if (str && *str) {
|
|
|
|
target = object_resolve_path(uc, str, NULL);
|
|
|
|
if (!target) {
|
2018-02-13 22:23:09 +00:00
|
|
|
error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
|
|
|
|
"Device '%s' not found", str);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(str);
|
2015-08-21 07:04:50 +00:00
|
|
|
return target;
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_property_set_bool(struct uc_struct *uc, Object *obj, bool value,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
2018-02-13 22:13:24 +00:00
|
|
|
QBool *qbool = qbool_from_bool(value);
|
2015-08-21 07:04:50 +00:00
|
|
|
object_property_set_qobject(uc, obj, QOBJECT(qbool), name, errp);
|
|
|
|
|
|
|
|
QDECREF(qbool);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool object_property_get_bool(struct uc_struct *uc, Object *obj, const char *name,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QObject *ret = object_property_get_qobject(uc, obj, name, errp);
|
|
|
|
QBool *qbool;
|
|
|
|
bool retval;
|
|
|
|
|
|
|
|
if (!ret) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
qbool = qobject_to_qbool(ret);
|
|
|
|
if (!qbool) {
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "boolean");
|
2015-08-21 07:04:50 +00:00
|
|
|
retval = false;
|
|
|
|
} else {
|
2018-02-13 22:13:24 +00:00
|
|
|
retval = qbool_get_bool(qbool);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-03-03 22:43:24 +00:00
|
|
|
qobject_decref(ret);
|
2015-08-21 07:04:50 +00:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_property_set_int(struct uc_struct *uc, Object *obj, int64_t value,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
2018-03-03 22:43:24 +00:00
|
|
|
QNum *qnum = qnum_from_int(value);
|
|
|
|
object_property_set_qobject(uc, obj, QOBJECT(qnum), name, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-03-03 22:43:24 +00:00
|
|
|
QDECREF(qnum);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int64_t object_property_get_int(struct uc_struct *uc, Object *obj, const char *name,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QObject *ret = object_property_get_qobject(uc, obj, name, errp);
|
2018-03-03 22:43:24 +00:00
|
|
|
QNum *qnum;
|
2015-08-21 07:04:50 +00:00
|
|
|
int64_t retval;
|
|
|
|
|
|
|
|
if (!ret) {
|
|
|
|
return -1;
|
|
|
|
}
|
2018-03-03 22:43:24 +00:00
|
|
|
|
|
|
|
qnum = qobject_to_qnum(ret);
|
|
|
|
if (!qnum || !qnum_get_try_int(qnum, &retval)) {
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "int");
|
2015-08-21 07:04:50 +00:00
|
|
|
retval = -1;
|
|
|
|
}
|
|
|
|
|
2018-03-03 22:43:24 +00:00
|
|
|
qobject_decref(ret);
|
2015-08-21 07:04:50 +00:00
|
|
|
return retval;
|
|
|
|
}
|
2018-03-03 23:43:14 +00:00
|
|
|
|
|
|
|
void object_property_set_uint(struct uc_struct *uc, Object *obj, uint64_t value,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
QNum *qnum = qnum_from_uint(value);
|
|
|
|
|
|
|
|
object_property_set_qobject(uc, obj, QOBJECT(qnum), name, errp);
|
|
|
|
QDECREF(qnum);
|
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t object_property_get_uint(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
QObject *ret = object_property_get_qobject(uc, obj, name, errp);
|
|
|
|
QNum *qnum;
|
|
|
|
uint64_t retval;
|
|
|
|
|
|
|
|
if (!ret) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
qnum = qobject_to_qnum(ret);
|
|
|
|
if (!qnum || !qnum_get_try_uint(qnum, &retval)) {
|
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "uint");
|
|
|
|
retval = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
qobject_decref(ret);
|
|
|
|
return retval;
|
|
|
|
}
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
void object_property_parse(struct uc_struct *uc, Object *obj, const char *string,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
2018-02-25 06:08:00 +00:00
|
|
|
Visitor *v = string_input_visitor_new(string);
|
|
|
|
object_property_set(uc, obj, v, name, errp);
|
|
|
|
visit_free(v);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
const char *object_property_get_type(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-21 18:58:46 +00:00
|
|
|
ObjectProperty *prop = object_property_find(uc, obj, name, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (prop == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return prop->type;
|
|
|
|
}
|
|
|
|
|
|
|
|
Object *object_get_root(struct uc_struct *uc)
|
|
|
|
{
|
|
|
|
if (!uc->root) {
|
|
|
|
uc->root = object_new(uc, "container");
|
|
|
|
}
|
|
|
|
|
|
|
|
return uc->root;
|
|
|
|
}
|
|
|
|
|
2018-03-05 06:16:25 +00:00
|
|
|
Object *object_get_internal_root(struct uc_struct *uc)
|
|
|
|
{
|
|
|
|
static Object *internal_root;
|
|
|
|
|
|
|
|
if (!internal_root) {
|
|
|
|
internal_root = object_new(uc, "container");
|
|
|
|
}
|
|
|
|
|
|
|
|
return internal_root;
|
|
|
|
}
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
static void object_get_child_property(struct uc_struct *uc, Object *obj, Visitor *v,
|
|
|
|
const char *name, void *opaque, Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
Object *child = opaque;
|
|
|
|
gchar *path;
|
|
|
|
|
|
|
|
path = object_get_canonical_path(child);
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_str(v, name, &path, errp);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(path);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static Object *object_resolve_child_property(struct uc_struct *uc, Object *parent, void *opaque, const gchar *part)
|
|
|
|
{
|
|
|
|
return opaque;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void object_finalize_child_property(struct uc_struct *uc, Object *obj, const char *name,
|
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
Object *child = opaque;
|
|
|
|
|
|
|
|
if (child->class->unparent) {
|
|
|
|
(child->class->unparent)(uc, child);
|
|
|
|
}
|
|
|
|
child->parent = NULL;
|
|
|
|
object_unref(uc, child);
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_property_add_child(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, Object *child,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
Error *local_err = NULL;
|
|
|
|
gchar *type;
|
|
|
|
ObjectProperty *op;
|
|
|
|
|
|
|
|
if (child->parent != NULL) {
|
|
|
|
error_setg(errp, "child object is already parented");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
type = g_strdup_printf("child<%s>", object_get_typename(OBJECT(child)));
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
op = object_property_add(uc, obj, name, type, object_get_child_property, NULL,
|
2015-08-21 07:04:50 +00:00
|
|
|
object_finalize_child_property, child, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
op->resolve = object_resolve_child_property;
|
|
|
|
object_ref(child);
|
|
|
|
child->parent = obj;
|
|
|
|
|
|
|
|
out:
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(type);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-03-04 03:17:13 +00:00
|
|
|
void object_property_allow_set_link(const Object *obj, const char *name,
|
2015-08-21 07:04:50 +00:00
|
|
|
Object *val, Error **errp)
|
|
|
|
{
|
|
|
|
/* Allow the link to be set, always */
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
Object **child;
|
2018-03-04 03:17:13 +00:00
|
|
|
void (*check)(const Object *, const char *, Object *, Error **);
|
2015-08-21 07:04:50 +00:00
|
|
|
ObjectPropertyLinkFlags flags;
|
|
|
|
} LinkProperty;
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
static void object_get_link_property(struct uc_struct *uc,
|
|
|
|
Object *obj, Visitor *v,
|
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
LinkProperty *lprop = opaque;
|
|
|
|
Object **child = lprop->child;
|
|
|
|
gchar *path;
|
|
|
|
|
|
|
|
if (*child) {
|
|
|
|
path = object_get_canonical_path(*child);
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_str(v, name, &path, errp);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(path);
|
2015-08-21 07:04:50 +00:00
|
|
|
} else {
|
|
|
|
path = (gchar *)"";
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_str(v, name, &path, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* object_resolve_link:
|
|
|
|
*
|
|
|
|
* Lookup an object and ensure its type matches the link property type. This
|
|
|
|
* is similar to object_resolve_path() except type verification against the
|
|
|
|
* link property is performed.
|
|
|
|
*
|
|
|
|
* Returns: The matched object or NULL on path lookup failures.
|
|
|
|
*/
|
|
|
|
static Object *object_resolve_link(struct uc_struct *uc, Object *obj, const char *name,
|
|
|
|
const char *path, Error **errp)
|
|
|
|
{
|
|
|
|
const char *type;
|
|
|
|
gchar *target_type;
|
|
|
|
bool ambiguous = false;
|
|
|
|
Object *target;
|
|
|
|
|
|
|
|
/* Go from link<FOO> to FOO. */
|
2018-02-21 18:58:46 +00:00
|
|
|
type = object_property_get_type(uc, obj, name, NULL);
|
2015-08-21 07:04:50 +00:00
|
|
|
target_type = g_strndup(&type[5], strlen(type) - 6);
|
|
|
|
target = object_resolve_path_type(uc, path, target_type, &ambiguous);
|
|
|
|
|
|
|
|
if (ambiguous) {
|
2018-02-17 23:03:32 +00:00
|
|
|
error_setg(errp, "Path '%s' does not uniquely identify an object",
|
|
|
|
path);
|
2015-08-21 07:04:50 +00:00
|
|
|
} else if (!target) {
|
|
|
|
target = object_resolve_path(uc, path, &ambiguous);
|
|
|
|
if (target || ambiguous) {
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, target_type);
|
2015-08-21 07:04:50 +00:00
|
|
|
} else {
|
2018-02-13 22:23:09 +00:00
|
|
|
error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
|
|
|
|
"Device '%s' not found", path);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
target = NULL;
|
|
|
|
}
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(target_type);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
return target;
|
|
|
|
}
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
static void object_set_link_property(struct uc_struct *uc,
|
|
|
|
Object *obj, Visitor *v,
|
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
Error *local_err = NULL;
|
|
|
|
LinkProperty *prop = opaque;
|
|
|
|
Object **child = prop->child;
|
|
|
|
Object *old_target = *child;
|
|
|
|
Object *new_target = NULL;
|
|
|
|
char *path = NULL;
|
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_str(v, name, &path, &local_err);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
if (!local_err && strcmp(path, "") != 0) {
|
|
|
|
new_target = object_resolve_link(uc, obj, name, path, &local_err);
|
|
|
|
}
|
|
|
|
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(path);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
return;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
prop->check(obj, name, new_target, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
return;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
object_ref(new_target);
|
|
|
|
*child = new_target;
|
|
|
|
object_unref(uc, old_target);
|
|
|
|
}
|
|
|
|
|
|
|
|
static Object *object_resolve_link_property(struct uc_struct *uc, Object *parent, void *opaque, const gchar *part)
|
|
|
|
{
|
|
|
|
LinkProperty *lprop = opaque;
|
|
|
|
|
|
|
|
return *lprop->child;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void object_release_link_property(struct uc_struct *uc, Object *obj, const char *name,
|
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
LinkProperty *prop = opaque;
|
|
|
|
|
|
|
|
if ((prop->flags & OBJ_PROP_LINK_UNREF_ON_RELEASE) && *prop->child) {
|
|
|
|
object_unref(uc, *prop->child);
|
|
|
|
}
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(prop);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_property_add_link(struct uc_struct *uc, Object *obj, const char *name,
|
2015-08-21 07:04:50 +00:00
|
|
|
const char *type, Object **child,
|
2018-03-04 03:17:13 +00:00
|
|
|
void (*check)(const Object *, const char *,
|
2015-08-21 07:04:50 +00:00
|
|
|
Object *, Error **),
|
|
|
|
ObjectPropertyLinkFlags flags,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
Error *local_err = NULL;
|
|
|
|
LinkProperty *prop = g_malloc(sizeof(*prop));
|
|
|
|
gchar *full_type;
|
|
|
|
ObjectProperty *op;
|
|
|
|
|
|
|
|
prop->child = child;
|
|
|
|
prop->check = check;
|
|
|
|
prop->flags = flags;
|
|
|
|
|
|
|
|
full_type = g_strdup_printf("link<%s>", type);
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
op = object_property_add(uc, obj, name, full_type,
|
2015-08-21 07:04:50 +00:00
|
|
|
object_get_link_property,
|
|
|
|
check ? object_set_link_property : NULL,
|
|
|
|
object_release_link_property,
|
|
|
|
prop,
|
|
|
|
&local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(prop);
|
2015-08-21 07:04:50 +00:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
op->resolve = object_resolve_link_property;
|
|
|
|
|
|
|
|
out:
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(full_type);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
gchar *object_get_canonical_path_component(Object *obj)
|
|
|
|
{
|
|
|
|
ObjectProperty *prop = NULL;
|
2018-02-21 18:33:58 +00:00
|
|
|
GHashTableIter iter;
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
g_assert(obj);
|
|
|
|
g_assert(obj->parent != NULL);
|
|
|
|
|
2018-02-21 18:33:58 +00:00
|
|
|
g_hash_table_iter_init(&iter, obj->parent->properties);
|
|
|
|
while (g_hash_table_iter_next(&iter, NULL, (gpointer *)&prop)) {
|
2015-08-21 07:04:50 +00:00
|
|
|
if (!object_property_is_child(prop)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prop->opaque == obj) {
|
|
|
|
return g_strdup(prop->name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* obj had a parent but was not a child, should never happen */
|
|
|
|
g_assert_not_reached();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
gchar *object_get_canonical_path(Object *obj)
|
|
|
|
{
|
|
|
|
Object *root = object_get_root(NULL);
|
|
|
|
char *newpath, *path = NULL;
|
|
|
|
|
|
|
|
while (obj != root) {
|
|
|
|
char *component = object_get_canonical_path_component(obj);
|
|
|
|
|
|
|
|
if (path) {
|
|
|
|
newpath = g_strdup_printf("%s/%s", component, path);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(component);
|
|
|
|
g_free(path);
|
2015-08-21 07:04:50 +00:00
|
|
|
path = newpath;
|
|
|
|
} else {
|
|
|
|
path = component;
|
|
|
|
}
|
|
|
|
|
|
|
|
obj = obj->parent;
|
|
|
|
}
|
|
|
|
|
|
|
|
newpath = g_strdup_printf("/%s", path ? path : "");
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(path);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
return newpath;
|
|
|
|
}
|
|
|
|
|
|
|
|
Object *object_resolve_path_component(struct uc_struct *uc, Object *parent, const gchar *part)
|
|
|
|
{
|
2018-02-21 18:58:46 +00:00
|
|
|
ObjectProperty *prop = object_property_find(uc, parent, part, NULL);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (prop == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prop->resolve) {
|
|
|
|
return prop->resolve(uc, parent, prop->opaque, part);
|
|
|
|
} else {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static Object *object_resolve_abs_path(struct uc_struct *uc, Object *parent,
|
|
|
|
gchar **parts,
|
|
|
|
const char *typename,
|
|
|
|
int index)
|
|
|
|
{
|
|
|
|
Object *child;
|
|
|
|
|
|
|
|
if (parts[index] == NULL) {
|
|
|
|
return object_dynamic_cast(uc, parent, typename);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strcmp(parts[index], "") == 0) {
|
|
|
|
return object_resolve_abs_path(uc, parent, parts, typename, index + 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
child = object_resolve_path_component(uc, parent, parts[index]);
|
|
|
|
if (!child) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return object_resolve_abs_path(uc, child, parts, typename, index + 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static Object *object_resolve_partial_path(struct uc_struct *uc, Object *parent,
|
|
|
|
gchar **parts,
|
|
|
|
const char *typename,
|
|
|
|
bool *ambiguous)
|
|
|
|
{
|
|
|
|
Object *obj;
|
2018-02-21 18:33:58 +00:00
|
|
|
GHashTableIter iter;
|
2015-08-21 07:04:50 +00:00
|
|
|
ObjectProperty *prop;
|
|
|
|
|
|
|
|
obj = object_resolve_abs_path(uc, parent, parts, typename, 0);
|
|
|
|
|
2018-02-21 18:33:58 +00:00
|
|
|
g_hash_table_iter_init(&iter, parent->properties);
|
|
|
|
while (g_hash_table_iter_next(&iter, NULL, (gpointer *)&prop)) {
|
2015-08-21 07:04:50 +00:00
|
|
|
Object *found;
|
|
|
|
|
|
|
|
if (!object_property_is_child(prop)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
found = object_resolve_partial_path(uc, prop->opaque, parts,
|
|
|
|
typename, ambiguous);
|
|
|
|
if (found) {
|
|
|
|
if (obj) {
|
2018-03-04 03:49:14 +00:00
|
|
|
*ambiguous = true;
|
2015-08-21 07:04:50 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
obj = found;
|
|
|
|
}
|
|
|
|
|
2018-03-04 03:49:14 +00:00
|
|
|
if (*ambiguous) {
|
2015-08-21 07:04:50 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
Object *object_resolve_path_type(struct uc_struct *uc, const char *path, const char *typename,
|
2018-03-04 03:49:14 +00:00
|
|
|
bool *ambiguousp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
Object *obj;
|
|
|
|
gchar **parts;
|
|
|
|
|
|
|
|
parts = g_strsplit(path, "/", 0);
|
|
|
|
assert(parts);
|
|
|
|
|
|
|
|
if (parts[0] == NULL || strcmp(parts[0], "") != 0) {
|
2018-03-04 03:49:14 +00:00
|
|
|
bool ambiguous = false;
|
2015-08-21 07:04:50 +00:00
|
|
|
obj = object_resolve_partial_path(uc, object_get_root(NULL), parts,
|
2018-03-04 03:49:14 +00:00
|
|
|
typename, &ambiguous);
|
|
|
|
if (ambiguousp) {
|
|
|
|
*ambiguousp = ambiguous;
|
|
|
|
}
|
2015-08-21 07:04:50 +00:00
|
|
|
} else {
|
|
|
|
obj = object_resolve_abs_path(uc, object_get_root(NULL), parts, typename, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_strfreev(parts);
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
Object *object_resolve_path(struct uc_struct *uc, const char *path, bool *ambiguous)
|
|
|
|
{
|
|
|
|
return object_resolve_path_type(uc, path, TYPE_OBJECT, ambiguous);
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct StringProperty
|
|
|
|
{
|
|
|
|
char *(*get)(struct uc_struct *uc, Object *, Error **);
|
2015-11-11 17:43:41 +00:00
|
|
|
int (*set)(struct uc_struct *uc, Object *, const char *, Error **);
|
2015-08-21 07:04:50 +00:00
|
|
|
} StringProperty;
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
static void property_get_str(struct uc_struct *uc,
|
|
|
|
Object *obj, Visitor *v,
|
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
StringProperty *prop = opaque;
|
|
|
|
char *value;
|
2018-02-15 00:22:46 +00:00
|
|
|
Error *err = NULL;
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-15 00:22:46 +00:00
|
|
|
value = prop->get(uc, obj, &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
2018-02-15 00:22:46 +00:00
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_str(v, name, &value, errp);
|
2018-02-15 00:22:46 +00:00
|
|
|
g_free(value);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
static void property_set_str(struct uc_struct *uc,
|
|
|
|
Object *obj, Visitor *v,
|
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
StringProperty *prop = opaque;
|
|
|
|
char *value;
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_str(v, name, &value, &local_err);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
return;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
prop->set(uc, obj, value, errp);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(value);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void property_release_str(struct uc_struct *uc, Object *obj, const char *name,
|
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
StringProperty *prop = opaque;
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(prop);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_property_add_str(struct uc_struct *uc, Object *obj, const char *name,
|
2015-08-21 07:04:50 +00:00
|
|
|
char *(*get)(struct uc_struct *uc, Object *, Error **),
|
2015-11-11 17:43:41 +00:00
|
|
|
int (*set)(struct uc_struct *uc, Object *, const char *, Error **),
|
2015-08-21 07:04:50 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
Error *local_err = NULL;
|
|
|
|
StringProperty *prop = g_malloc0(sizeof(*prop));
|
|
|
|
|
|
|
|
prop->get = get;
|
|
|
|
prop->set = set;
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
object_property_add(uc, obj, name, "string",
|
2015-08-21 07:04:50 +00:00
|
|
|
get ? property_get_str : NULL,
|
|
|
|
set ? property_set_str : NULL,
|
|
|
|
property_release_str,
|
|
|
|
prop, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(prop);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_class_property_add_str(struct uc_struct *uc, ObjectClass *klass, const char *name,
|
|
|
|
char *(*get)(struct uc_struct *, Object *, Error **),
|
|
|
|
int (*set)(struct uc_struct *, Object *, const char *,
|
|
|
|
Error **),
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
Error *local_err = NULL;
|
|
|
|
StringProperty *prop = g_malloc0(sizeof(*prop));
|
|
|
|
|
|
|
|
prop->get = get;
|
|
|
|
prop->set = set;
|
|
|
|
|
|
|
|
object_class_property_add(uc, klass, name, "string",
|
|
|
|
get ? property_get_str : NULL,
|
|
|
|
set ? property_set_str : NULL,
|
|
|
|
property_release_str,
|
|
|
|
prop, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
g_free(prop);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-21 07:04:50 +00:00
|
|
|
typedef struct BoolProperty
|
|
|
|
{
|
|
|
|
bool (*get)(struct uc_struct *uc, Object *, Error **);
|
2015-11-11 17:43:41 +00:00
|
|
|
int (*set)(struct uc_struct *uc, Object *, bool, Error **);
|
2015-08-21 07:04:50 +00:00
|
|
|
} BoolProperty;
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
static void property_get_bool(struct uc_struct *uc,
|
|
|
|
Object *obj, Visitor *v,
|
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
BoolProperty *prop = opaque;
|
|
|
|
bool value;
|
|
|
|
|
|
|
|
value = prop->get(uc, obj, errp);
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_bool(v, name, &value, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
static void property_set_bool(struct uc_struct *uc,
|
|
|
|
Object *obj, Visitor *v,
|
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
BoolProperty *prop = opaque;
|
|
|
|
bool value;
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_bool(v, name, &value, &local_err);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
return;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
prop->set(uc, obj, value, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
static void property_release_bool(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, void *opaque)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
BoolProperty *prop = opaque;
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(prop);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void object_property_add_bool(struct uc_struct *uc, Object *obj, const char *name,
|
|
|
|
bool (*get)(struct uc_struct *uc, Object *, Error **),
|
2015-11-11 17:43:41 +00:00
|
|
|
int (*set)(struct uc_struct *uc, Object *, bool, Error **),
|
2015-08-21 07:04:50 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
Error *local_err = NULL;
|
|
|
|
BoolProperty *prop = g_malloc0(sizeof(*prop));
|
|
|
|
|
|
|
|
prop->get = get;
|
|
|
|
prop->set = set;
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
object_property_add(uc, obj, name, "bool",
|
2015-08-21 07:04:50 +00:00
|
|
|
get ? property_get_bool : NULL,
|
|
|
|
set ? property_set_bool : NULL,
|
|
|
|
property_release_bool,
|
|
|
|
prop, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(prop);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_class_property_add_bool(struct uc_struct *uc, ObjectClass *klass,
|
|
|
|
const char *name,
|
|
|
|
bool (*get)(struct uc_struct *, Object *, Error **),
|
|
|
|
int (*set)(struct uc_struct *, Object *, bool, Error **),
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
Error *local_err = NULL;
|
|
|
|
BoolProperty *prop = g_malloc0(sizeof(*prop));
|
|
|
|
|
|
|
|
prop->get = get;
|
|
|
|
prop->set = set;
|
|
|
|
|
|
|
|
object_class_property_add(uc, klass, name, "bool",
|
|
|
|
get ? property_get_bool : NULL,
|
|
|
|
set ? property_set_bool : NULL,
|
|
|
|
property_release_bool,
|
|
|
|
prop, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
g_free(prop);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-21 07:04:50 +00:00
|
|
|
static char *qdev_get_type(struct uc_struct *uc, Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
return g_strdup(object_get_typename(obj));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void property_get_uint8_ptr(struct uc_struct *uc, Object *obj, Visitor *v,
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
const char *name, void *opaque,
|
2015-08-21 07:04:50 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
uint8_t value = *(uint8_t *)opaque;
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_uint8(v, name, &value, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void property_get_uint16_ptr(struct uc_struct *uc, Object *obj, Visitor *v,
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
uint16_t value = *(uint16_t *)opaque;
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_uint16(v, name, &value, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void property_get_uint32_ptr(struct uc_struct *uc, Object *obj, Visitor *v,
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
uint32_t value = *(uint32_t *)opaque;
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_uint32(v, name, &value, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void property_get_uint64_ptr(struct uc_struct *uc, Object *obj, Visitor *v,
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
uint64_t value = *(uint64_t *)opaque;
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Backports commit 51e72bc1dd6ace6e91d675f41a1f09bd00ab8043 from qemu
2018-02-20 03:31:04 +00:00
|
|
|
visit_type_uint64(v, name, &value, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_class_property_add_uint8_ptr(struct uc_struct *uc, ObjectClass *klass,
|
|
|
|
const char *name, const uint8_t *v,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
object_class_property_add(uc, klass, name, "uint8", property_get_uint8_ptr,
|
|
|
|
NULL, NULL, (void *)v, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_property_add_uint8_ptr(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, const uint8_t *v,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-21 18:58:46 +00:00
|
|
|
object_property_add(uc, obj, name, "uint8", property_get_uint8_ptr,
|
2015-08-21 07:04:50 +00:00
|
|
|
NULL, NULL, (void *)v, errp);
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_class_property_add_uint16_ptr(struct uc_struct *uc, ObjectClass *klass,
|
|
|
|
const char *name, const uint16_t *v,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-21 18:58:46 +00:00
|
|
|
object_class_property_add(uc, klass, name, "uint16", property_get_uint16_ptr,
|
|
|
|
NULL, NULL, (void *)v, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_property_add_uint16_ptr(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, const uint16_t *v,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
object_property_add(uc, obj, name, "uint16", property_get_uint16_ptr,
|
2015-08-21 07:04:50 +00:00
|
|
|
NULL, NULL, (void *)v, errp);
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_class_property_add_uint32_ptr(struct uc_struct *uc, ObjectClass *klass,
|
|
|
|
const char *name, const uint32_t *v,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-21 18:58:46 +00:00
|
|
|
object_class_property_add(uc, klass, name, "uint32", property_get_uint32_ptr,
|
|
|
|
NULL, NULL, (void *)v, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_property_add_uint32_ptr(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, const uint32_t *v,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
object_property_add(uc, obj, name, "uint32", property_get_uint32_ptr,
|
2015-08-21 07:04:50 +00:00
|
|
|
NULL, NULL, (void *)v, errp);
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_class_property_add_uint64_ptr(struct uc_struct *uc, ObjectClass *klass,
|
|
|
|
const char *name, const uint64_t *v,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
object_class_property_add(uc, klass, name, "uint64", property_get_uint64_ptr,
|
|
|
|
NULL, NULL, (void *)v, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
void object_property_add_uint64_ptr(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, const uint64_t *v,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-21 18:58:46 +00:00
|
|
|
object_property_add(uc, obj, name, "uint64", property_get_uint64_ptr,
|
2015-08-21 07:04:50 +00:00
|
|
|
NULL, NULL, (void *)v, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
Object *target_obj;
|
2018-02-14 20:14:06 +00:00
|
|
|
char *target_name;
|
2015-08-21 07:04:50 +00:00
|
|
|
} AliasProperty;
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
static void property_get_alias(struct uc_struct *uc,
|
|
|
|
Object *obj, struct Visitor *v,
|
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
AliasProperty *prop = opaque;
|
|
|
|
|
|
|
|
object_property_get(uc, prop->target_obj, v, prop->target_name, errp);
|
|
|
|
}
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Backports commit d7bce9999df85c56c8cb1fcffd944d51bff8ff48 from qemu
2018-02-20 03:57:03 +00:00
|
|
|
static void property_set_alias(struct uc_struct *uc,
|
|
|
|
Object *obj, struct Visitor *v,
|
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
AliasProperty *prop = opaque;
|
|
|
|
|
|
|
|
object_property_set(uc, prop->target_obj, v, prop->target_name, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
static Object *property_resolve_alias(struct uc_struct *uc, Object *obj, void *opaque,
|
|
|
|
const gchar *part)
|
|
|
|
{
|
|
|
|
AliasProperty *prop = opaque;
|
|
|
|
|
|
|
|
return object_resolve_path_component(uc, prop->target_obj, prop->target_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void property_release_alias(struct uc_struct *uc, Object *obj, const char *name, void *opaque)
|
|
|
|
{
|
|
|
|
AliasProperty *prop = opaque;
|
|
|
|
|
2018-02-14 20:14:06 +00:00
|
|
|
g_free(prop->target_name);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(prop);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_property_add_alias(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, Object *target_obj,
|
|
|
|
const char *target_name,
|
2015-08-21 07:04:50 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
AliasProperty *prop;
|
|
|
|
ObjectProperty *op;
|
|
|
|
ObjectProperty *target_prop;
|
|
|
|
gchar *prop_type;
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
target_prop = object_property_find(uc, target_obj, target_name, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (!target_prop) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (object_property_is_child(target_prop)) {
|
|
|
|
prop_type = g_strdup_printf("link%s",
|
|
|
|
target_prop->type + strlen("child"));
|
|
|
|
} else {
|
|
|
|
prop_type = g_strdup(target_prop->type);
|
|
|
|
}
|
|
|
|
|
|
|
|
prop = g_malloc(sizeof(*prop));
|
|
|
|
prop->target_obj = target_obj;
|
2018-02-14 20:14:06 +00:00
|
|
|
prop->target_name = g_strdup(target_name);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
op = object_property_add(uc, obj, name, prop_type,
|
2015-08-21 07:04:50 +00:00
|
|
|
property_get_alias,
|
|
|
|
property_set_alias,
|
|
|
|
property_release_alias,
|
|
|
|
prop, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(prop);
|
2015-08-21 07:04:50 +00:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
op->resolve = property_resolve_alias;
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
object_property_set_description(uc, obj, op->name,
|
2015-08-21 07:04:50 +00:00
|
|
|
target_prop->description,
|
|
|
|
&error_abort);
|
|
|
|
|
|
|
|
out:
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(prop_type);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_property_set_description(struct uc_struct *uc, Object *obj,
|
|
|
|
const char *name, const char *description,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
ObjectProperty *op;
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
op = object_property_find(uc, obj, name, errp);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (!op) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(op->description);
|
2015-08-21 07:04:50 +00:00
|
|
|
op->description = g_strdup(description);
|
|
|
|
}
|
|
|
|
|
2018-02-21 18:58:46 +00:00
|
|
|
void object_class_property_set_description(struct uc_struct *uc,
|
|
|
|
ObjectClass *klass,
|
|
|
|
const char *name,
|
|
|
|
const char *description,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
ObjectProperty *op;
|
|
|
|
|
|
|
|
op = g_hash_table_lookup(klass->properties, name);
|
|
|
|
if (!op) {
|
|
|
|
error_setg(errp, "Property '.%s' not found", name);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_free(op->description);
|
|
|
|
op->description = g_strdup(description);
|
|
|
|
}
|
|
|
|
|
2015-08-21 07:04:50 +00:00
|
|
|
static void object_instance_init(struct uc_struct *uc, Object *obj, void *opaque)
|
|
|
|
{
|
2018-02-21 18:58:46 +00:00
|
|
|
object_property_add_str(uc, obj, "type", qdev_get_type, NULL, NULL);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void register_types_object(struct uc_struct *uc)
|
|
|
|
{
|
|
|
|
static TypeInfo interface_info = {
|
2017-01-19 11:50:28 +00:00
|
|
|
TYPE_INTERFACE, // name
|
2017-01-21 01:28:22 +00:00
|
|
|
NULL,
|
2017-01-19 11:50:28 +00:00
|
|
|
|
|
|
|
sizeof(InterfaceClass), // class_size
|
2017-01-21 01:28:22 +00:00
|
|
|
0,
|
|
|
|
NULL,
|
2017-01-19 11:50:28 +00:00
|
|
|
|
2017-01-21 01:28:22 +00:00
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
2017-01-19 11:50:28 +00:00
|
|
|
|
2017-01-21 01:28:22 +00:00
|
|
|
NULL,
|
2017-01-19 11:50:28 +00:00
|
|
|
|
2017-01-21 01:28:22 +00:00
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
2017-01-19 11:50:28 +00:00
|
|
|
|
|
|
|
true, // abstract
|
2015-08-21 07:04:50 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static TypeInfo object_info = {
|
2017-01-19 11:50:28 +00:00
|
|
|
TYPE_OBJECT,
|
2017-01-21 01:28:22 +00:00
|
|
|
NULL,
|
2017-01-19 11:50:28 +00:00
|
|
|
|
|
|
|
0,
|
2017-01-21 01:28:22 +00:00
|
|
|
sizeof(Object),
|
2017-01-19 11:50:28 +00:00
|
|
|
NULL,
|
|
|
|
|
2017-01-21 01:28:22 +00:00
|
|
|
object_instance_init,
|
|
|
|
NULL,
|
2017-01-19 11:50:28 +00:00
|
|
|
NULL,
|
|
|
|
|
2017-01-21 01:28:22 +00:00
|
|
|
NULL,
|
2017-01-19 11:50:28 +00:00
|
|
|
|
2017-01-21 01:28:22 +00:00
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
2017-01-19 11:50:28 +00:00
|
|
|
|
2017-01-21 01:28:22 +00:00
|
|
|
true,
|
2015-08-21 07:04:50 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
uc->type_interface = type_register_internal(uc, &interface_info);
|
|
|
|
type_register_internal(uc, &object_info);
|
|
|
|
}
|