[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/26] object: make object_class_property_add* return property
|
From: |
Marc-André Lureau |
|
Subject: |
[PATCH 08/26] object: make object_class_property_add* return property |
|
Date: |
Sun, 1 Dec 2019 15:15:13 +0400 |
This will help calling other ObjectProperty associated functions
easily after.
Signed-off-by: Marc-André Lureau <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 8d442cf633..102d941ca5 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1537,7 +1537,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 **),
@@ -1559,7 +1560,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);
@@ -1583,7 +1585,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 **),
@@ -1604,7 +1607,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);
@@ -1620,7 +1624,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);
/**
@@ -1635,7 +1640,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);
/**
@@ -1650,7 +1656,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);
/**
@@ -1665,7 +1672,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 844a2d66bf..de43b30e5e 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -2041,7 +2041,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 **),
@@ -2049,11 +2050,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,
@@ -2062,6 +2064,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
@@ -2131,18 +2135,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,
@@ -2151,6 +2157,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,
@@ -2216,7 +2224,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 **),
@@ -2225,12 +2234,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,
@@ -2239,6 +2249,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 {
@@ -2319,16 +2331,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);
@@ -2336,6 +2350,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)
@@ -2378,11 +2394,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,
@@ -2392,11 +2410,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,
@@ -2406,11 +2426,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,
@@ -2420,11 +2442,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 {
--
2.24.0
- Re: [PATCH 01/26] object: add extra sanity checks, (continued)
- [PATCH 02/26] qdev: remove duplicated qdev_property_add_static() doc, Marc-André Lureau, 2019/12/01
- [PATCH 03/26] qdev: remove extraneous error, Marc-André Lureau, 2019/12/01
- [PATCH 04/26] qdev: move helper function to monitor/misc, Marc-André Lureau, 2019/12/01
- [PATCH 05/26] object: avoid extra class property key duplication, Marc-André Lureau, 2019/12/01
- [PATCH 06/26] object: add class property initializer, Marc-André Lureau, 2019/12/01
- [PATCH 07/26] object: add object_property_get_defaut(), Marc-André Lureau, 2019/12/01
- [PATCH 08/26] object: make object_class_property_add* return property,
Marc-André Lureau <=
- [PATCH 09/26] qstring: add qstring_free(), Marc-André Lureau, 2019/12/01
- [PATCH 10/26] object: add object_property_set_defaut_{bool, str, int, uint}(), Marc-André Lureau, 2019/12/01
- [PATCH 11/26] object: do not free class properties, Marc-André Lureau, 2019/12/01
- [PATCH 12/26] object: check strong flag with &, Marc-André Lureau, 2019/12/01
- [PATCH 13/26] object: rename link "child" to "target", Marc-André Lureau, 2019/12/01
- [PATCH 14/26] object: add direct link flag, Marc-André Lureau, 2019/12/01
- [PATCH 15/26] object: express const link with link property, Marc-André Lureau, 2019/12/01
- [PATCH 16/26] object: add object_class_property_add_link(), Marc-André Lureau, 2019/12/01
- [PATCH 17/26] object: release all props, Marc-André Lureau, 2019/12/01
- [PATCH 18/26] object: return self in object_ref(), Marc-André Lureau, 2019/12/01