[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 37/59] object: make object_class_property_add* return property
From: |
Paolo Bonzini |
Subject: |
[PULL 37/59] object: make object_class_property_add* return property |
Date: |
Thu, 23 Jan 2020 14:50:27 +0100 |
From: Marc-André Lureau <address@hidden>
This will help calling other ObjectProperty associated functions
easily after.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/qom/object.h | 24 +++++++++++++-------
qom/object.c | 64 ++++++++++++++++++++++++++++++++++++----------------
2 files changed, 60 insertions(+), 28 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index 29f47d3..afe658c 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1539,7 +1539,8 @@ void object_property_add_str(Object *obj, const char
*name,
void (*set)(Object *, const char *, Error **),
Error **errp);
-void object_class_property_add_str(ObjectClass *klass, const char *name,
+ObjectProperty *object_class_property_add_str(ObjectClass *klass,
+ const char *name,
char *(*get)(Object *, Error **),
void (*set)(Object *, const char *,
Error **),
@@ -1561,7 +1562,8 @@ void object_property_add_bool(Object *obj, const char
*name,
void (*set)(Object *, bool, Error **),
Error **errp);
-void object_class_property_add_bool(ObjectClass *klass, const char *name,
+ObjectProperty *object_class_property_add_bool(ObjectClass *klass,
+ const char *name,
bool (*get)(Object *, Error **),
void (*set)(Object *, bool, Error **),
Error **errp);
@@ -1585,7 +1587,8 @@ void object_property_add_enum(Object *obj, const char
*name,
void (*set)(Object *, int, Error **),
Error **errp);
-void object_class_property_add_enum(ObjectClass *klass, const char *name,
+ObjectProperty *object_class_property_add_enum(ObjectClass *klass,
+ const char *name,
const char *typename,
const QEnumLookup *lookup,
int (*get)(Object *, Error **),
@@ -1606,7 +1609,8 @@ void object_property_add_tm(Object *obj, const char *name,
void (*get)(Object *, struct tm *, Error **),
Error **errp);
-void object_class_property_add_tm(ObjectClass *klass, const char *name,
+ObjectProperty *object_class_property_add_tm(ObjectClass *klass,
+ const char *name,
void (*get)(Object *, struct tm *, Error **),
Error **errp);
@@ -1622,7 +1626,8 @@ void object_class_property_add_tm(ObjectClass *klass,
const char *name,
*/
void object_property_add_uint8_ptr(Object *obj, const char *name,
const uint8_t *v, Error **errp);
-void object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name,
+ObjectProperty *object_class_property_add_uint8_ptr(ObjectClass *klass,
+ const char *name,
const uint8_t *v, Error **errp);
/**
@@ -1637,7 +1642,8 @@ void object_class_property_add_uint8_ptr(ObjectClass
*klass, const char *name,
*/
void object_property_add_uint16_ptr(Object *obj, const char *name,
const uint16_t *v, Error **errp);
-void object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name,
+ObjectProperty *object_class_property_add_uint16_ptr(ObjectClass *klass,
+ const char *name,
const uint16_t *v, Error **errp);
/**
@@ -1652,7 +1658,8 @@ void object_class_property_add_uint16_ptr(ObjectClass
*klass, const char *name,
*/
void object_property_add_uint32_ptr(Object *obj, const char *name,
const uint32_t *v, Error **errp);
-void object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name,
+ObjectProperty *object_class_property_add_uint32_ptr(ObjectClass *klass,
+ const char *name,
const uint32_t *v, Error **errp);
/**
@@ -1667,7 +1674,8 @@ void object_class_property_add_uint32_ptr(ObjectClass
*klass, const char *name,
*/
void object_property_add_uint64_ptr(Object *obj, const char *name,
const uint64_t *v, Error **errp);
-void object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name,
+ObjectProperty *object_class_property_add_uint64_ptr(ObjectClass *klass,
+ const char *name,
const uint64_t *v, Error **errp);
/**
diff --git a/qom/object.c b/qom/object.c
index cd7ce81..4ade409 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -2065,7 +2065,8 @@ void object_property_add_str(Object *obj, const char
*name,
}
}
-void object_class_property_add_str(ObjectClass *klass, const char *name,
+ObjectProperty *
+object_class_property_add_str(ObjectClass *klass, const char *name,
char *(*get)(Object *, Error **),
void (*set)(Object *, const char *,
Error **),
@@ -2073,11 +2074,12 @@ void object_class_property_add_str(ObjectClass *klass,
const char *name,
{
Error *local_err = NULL;
StringProperty *prop = g_malloc0(sizeof(*prop));
+ ObjectProperty *rv;
prop->get = get;
prop->set = set;
- object_class_property_add(klass, name, "string",
+ rv = object_class_property_add(klass, name, "string",
get ? property_get_str : NULL,
set ? property_set_str : NULL,
property_release_str,
@@ -2086,6 +2088,8 @@ void object_class_property_add_str(ObjectClass *klass,
const char *name,
error_propagate(errp, local_err);
g_free(prop);
}
+
+ return rv;
}
typedef struct BoolProperty
@@ -2155,18 +2159,20 @@ void object_property_add_bool(Object *obj, const char
*name,
}
}
-void object_class_property_add_bool(ObjectClass *klass, const char *name,
+ObjectProperty *
+object_class_property_add_bool(ObjectClass *klass, const char *name,
bool (*get)(Object *, Error **),
void (*set)(Object *, bool, Error **),
Error **errp)
{
Error *local_err = NULL;
BoolProperty *prop = g_malloc0(sizeof(*prop));
+ ObjectProperty *rv;
prop->get = get;
prop->set = set;
- object_class_property_add(klass, name, "bool",
+ rv = object_class_property_add(klass, name, "bool",
get ? property_get_bool : NULL,
set ? property_set_bool : NULL,
property_release_bool,
@@ -2175,6 +2181,8 @@ void object_class_property_add_bool(ObjectClass *klass,
const char *name,
error_propagate(errp, local_err);
g_free(prop);
}
+
+ return rv;
}
static void property_get_enum(Object *obj, Visitor *v, const char *name,
@@ -2240,7 +2248,8 @@ void object_property_add_enum(Object *obj, const char
*name,
}
}
-void object_class_property_add_enum(ObjectClass *klass, const char *name,
+ObjectProperty *
+object_class_property_add_enum(ObjectClass *klass, const char *name,
const char *typename,
const QEnumLookup *lookup,
int (*get)(Object *, Error **),
@@ -2249,12 +2258,13 @@ void object_class_property_add_enum(ObjectClass *klass,
const char *name,
{
Error *local_err = NULL;
EnumProperty *prop = g_malloc(sizeof(*prop));
+ ObjectProperty *rv;
prop->lookup = lookup;
prop->get = get;
prop->set = set;
- object_class_property_add(klass, name, typename,
+ rv = object_class_property_add(klass, name, typename,
get ? property_get_enum : NULL,
set ? property_set_enum : NULL,
property_release_enum,
@@ -2263,6 +2273,8 @@ void object_class_property_add_enum(ObjectClass *klass,
const char *name,
error_propagate(errp, local_err);
g_free(prop);
}
+
+ return rv;
}
typedef struct TMProperty {
@@ -2343,16 +2355,18 @@ void object_property_add_tm(Object *obj, const char
*name,
}
}
-void object_class_property_add_tm(ObjectClass *klass, const char *name,
+ObjectProperty *
+object_class_property_add_tm(ObjectClass *klass, const char *name,
void (*get)(Object *, struct tm *, Error **),
Error **errp)
{
Error *local_err = NULL;
TMProperty *prop = g_malloc0(sizeof(*prop));
+ ObjectProperty *rv;
prop->get = get;
- object_class_property_add(klass, name, "struct tm",
+ rv = object_class_property_add(klass, name, "struct tm",
get ? property_get_tm : NULL, NULL,
property_release_tm,
prop, &local_err);
@@ -2360,6 +2374,8 @@ void object_class_property_add_tm(ObjectClass *klass,
const char *name,
error_propagate(errp, local_err);
g_free(prop);
}
+
+ return rv;
}
static char *qdev_get_type(Object *obj, Error **errp)
@@ -2402,11 +2418,13 @@ void object_property_add_uint8_ptr(Object *obj, const
char *name,
NULL, NULL, (void *)v, errp);
}
-void object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name,
+ObjectProperty *
+object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name,
const uint8_t *v, Error **errp)
{
- object_class_property_add(klass, name, "uint8", property_get_uint8_ptr,
- NULL, NULL, (void *)v, errp);
+ return object_class_property_add(klass, name, "uint8",
+ property_get_uint8_ptr,
+ NULL, NULL, (void *)v, errp);
}
void object_property_add_uint16_ptr(Object *obj, const char *name,
@@ -2416,11 +2434,13 @@ void object_property_add_uint16_ptr(Object *obj, const
char *name,
NULL, NULL, (void *)v, errp);
}
-void object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name,
+ObjectProperty *
+object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name,
const uint16_t *v, Error **errp)
{
- object_class_property_add(klass, name, "uint16", property_get_uint16_ptr,
- NULL, NULL, (void *)v, errp);
+ return object_class_property_add(klass, name, "uint16",
+ property_get_uint16_ptr,
+ NULL, NULL, (void *)v, errp);
}
void object_property_add_uint32_ptr(Object *obj, const char *name,
@@ -2430,11 +2450,13 @@ void object_property_add_uint32_ptr(Object *obj, const
char *name,
NULL, NULL, (void *)v, errp);
}
-void object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name,
+ObjectProperty *
+object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name,
const uint32_t *v, Error **errp)
{
- object_class_property_add(klass, name, "uint32", property_get_uint32_ptr,
- NULL, NULL, (void *)v, errp);
+ return object_class_property_add(klass, name, "uint32",
+ property_get_uint32_ptr,
+ NULL, NULL, (void *)v, errp);
}
void object_property_add_uint64_ptr(Object *obj, const char *name,
@@ -2444,11 +2466,13 @@ void object_property_add_uint64_ptr(Object *obj, const
char *name,
NULL, NULL, (void *)v, errp);
}
-void object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name,
+ObjectProperty *
+object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name,
const uint64_t *v, Error **errp)
{
- object_class_property_add(klass, name, "uint64", property_get_uint64_ptr,
- NULL, NULL, (void *)v, errp);
+ return object_class_property_add(klass, name, "uint64",
+ property_get_uint64_ptr,
+ NULL, NULL, (void *)v, errp);
}
typedef struct {
--
1.8.3.1
- [PULL 27/59] qom/object: Display more helpful message when a parent is missing, (continued)
- [PULL 27/59] qom/object: Display more helpful message when a parent is missing, Paolo Bonzini, 2020/01/23
- [PULL 28/59] accel: Introduce the current_accel() wrapper, Paolo Bonzini, 2020/01/23
- [PULL 29/59] accel: Replace current_machine->accelerator by current_accel() wrapper, Paolo Bonzini, 2020/01/23
- [PULL 30/59] accel/tcg: Sanitize include path, Paolo Bonzini, 2020/01/23
- [PULL 31/59] object: add extra sanity checks, Paolo Bonzini, 2020/01/23
- [PULL 32/59] qdev: remove duplicated qdev_property_add_static() doc, Paolo Bonzini, 2020/01/23
- [PULL 33/59] qdev: remove extraneous error, Paolo Bonzini, 2020/01/23
- [PULL 34/59] qdev: move helper function to monitor/misc, Paolo Bonzini, 2020/01/23
- [PULL 35/59] object: avoid extra class property key duplication, Paolo Bonzini, 2020/01/23
- [PULL 36/59] object: add class property initializer, Paolo Bonzini, 2020/01/23
- [PULL 37/59] object: make object_class_property_add* return property,
Paolo Bonzini <=
- [PULL 38/59] qstring: add qstring_free(), Paolo Bonzini, 2020/01/23
- [PULL 39/59] object: add object_property_set_default, Paolo Bonzini, 2020/01/23
- [PULL 40/59] object: do not free class properties, Paolo Bonzini, 2020/01/23
- [PULL 41/59] object: check strong flag with &, Paolo Bonzini, 2020/01/23
- [PULL 42/59] object: rename link "child" to "target", Paolo Bonzini, 2020/01/23
- [PULL 43/59] object: add direct link flag, Paolo Bonzini, 2020/01/23
- [PULL 44/59] object: express const link with link property, Paolo Bonzini, 2020/01/23
- [PULL 45/59] object: add object_class_property_add_link(), Paolo Bonzini, 2020/01/23
- [PULL 46/59] object: release all props, Paolo Bonzini, 2020/01/23
- [PULL 47/59] object: return self in object_ref(), Paolo Bonzini, 2020/01/23