From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 38/59] object: make object_class_property_add* return property
Date: Thu, 23 Jan 2020 14:48:41 +0100 [thread overview]
Message-ID: <1579787342-27146-39-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1579787342-27146-1-git-send-email-pbonzini@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
This will help calling other ObjectProperty associated functions
easily after.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200110153039.1379601-9-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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 ca47308..9f52bc3 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1556,7 +1556,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 **),
@@ -1578,7 +1579,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);
@@ -1602,7 +1604,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 **),
@@ -1623,7 +1626,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);
@@ -1639,7 +1643,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);
/**
@@ -1654,7 +1659,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);
/**
@@ -1669,7 +1675,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);
/**
@@ -1684,7 +1691,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 49c2429..213a796 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -2074,7 +2074,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 **),
@@ -2082,11 +2083,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,
@@ -2095,6 +2097,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
@@ -2164,18 +2168,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,
@@ -2184,6 +2190,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,
@@ -2249,7 +2257,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 **),
@@ -2258,12 +2267,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,
@@ -2272,6 +2282,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 {
@@ -2352,16 +2364,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);
@@ -2369,6 +2383,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)
@@ -2411,11 +2427,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,
@@ -2425,11 +2443,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,
@@ -2439,11 +2459,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,
@@ -2453,11 +2475,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
next prev parent reply other threads:[~2020-01-23 15:52 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-23 13:48 [PULL 00/59] Misc patches for 2020-01-23 Paolo Bonzini
2020-01-23 13:48 ` [PULL 01/59] cpu: Introduce cpu_class_set_parent_reset() Paolo Bonzini
2020-01-23 13:48 ` [PULL 02/59] cpu: Use cpu_class_set_parent_reset() Paolo Bonzini
2020-01-23 13:48 ` [PULL 03/59] pvpanic: introduce crashloaded for pvpanic Paolo Bonzini
2020-01-23 13:48 ` [PULL 04/59] pvpanic: implement crashloaded event handling Paolo Bonzini
2020-01-23 13:48 ` [PULL 05/59] qom/object: Display more helpful message when an interface is missing Paolo Bonzini
2020-01-23 13:48 ` [PULL 06/59] audio/audio: Add missing fall through comment Paolo Bonzini
2020-01-23 13:48 ` [PULL 07/59] hw/display/tcx: Add missing fall through comments Paolo Bonzini
2020-01-23 13:48 ` [PULL 08/59] hw/timer/aspeed_timer: Add a fall through comment Paolo Bonzini
2020-01-23 13:48 ` [PULL 09/59] hw/net/imx_fec: Rewrite fall through comments Paolo Bonzini
2020-01-23 13:48 ` [PULL 10/59] hw/net/imx_fec: Remove unuseful FALLTHROUGH comments Paolo Bonzini
2020-01-23 13:48 ` [PULL 11/59] hw/pci-host/designware: Remove unuseful FALLTHROUGH comment Paolo Bonzini
2020-01-23 13:48 ` [PULL 12/59] configure: Do not build libfdt if not required Paolo Bonzini
2020-01-23 13:48 ` [PULL 13/59] Makefile: Clarify all the codebase requires qom/ objects Paolo Bonzini
2020-01-23 13:48 ` [PULL 14/59] Makefile: Restrict system emulation and tools objects Paolo Bonzini
2020-01-23 13:48 ` [PULL 15/59] Makefile: Remove unhelpful comment Paolo Bonzini
2020-01-23 13:48 ` [PULL 16/59] hw/core: Restrict reset handlers API to system-mode Paolo Bonzini
2020-01-23 13:48 ` [PULL 17/59] hw/core/Makefile: Group generic objects versus system-mode objects Paolo Bonzini
2020-01-23 13:48 ` [PULL 18/59] target/i386: kvm: initialize feature MSRs very early Paolo Bonzini
2020-01-23 13:48 ` [PULL 19/59] target/i386: add a ucode-rev property Paolo Bonzini
2020-01-23 13:48 ` [PULL 20/59] target/i386: kvm: initialize microcode revision from KVM Paolo Bonzini
2020-01-23 13:48 ` [PULL 21/59] virtio-scsi: delete vqs in unrealize to avoid memleaks Paolo Bonzini
2020-01-23 13:48 ` [PULL 22/59] virtio-scsi: convert to new virtio_delete_queue Paolo Bonzini
2020-01-23 13:48 ` [PULL 23/59] hw/ppc/spapr_rtas: Use local MachineState variable Paolo Bonzini
2020-01-23 13:48 ` [PULL 24/59] hw/ppc/spapr_rtas: Access MachineState via SpaprMachineState argument Paolo Bonzini
2020-01-23 13:48 ` [PULL 25/59] hw/ppc/spapr_rtas: Remove local variable Paolo Bonzini
2020-01-23 13:48 ` [PULL 26/59] target/arm/kvm: Use CPUState::kvm_state in kvm_arm_pmu_supported() Paolo Bonzini
2020-01-23 13:48 ` [PULL 27/59] qom/object: Display more helpful message when a parent is missing Paolo Bonzini
2020-01-23 13:48 ` [PULL 28/59] accel: Introduce the current_accel() wrapper Paolo Bonzini
2020-01-23 13:48 ` [PULL 29/59] accel: Replace current_machine->accelerator by " Paolo Bonzini
2020-01-23 13:48 ` [PULL 30/59] accel/tcg: Sanitize include path Paolo Bonzini
2020-01-23 13:48 ` [PULL 31/59] object: add extra sanity checks Paolo Bonzini
2020-01-23 13:48 ` [PULL 32/59] qdev: remove duplicated qdev_property_add_static() doc Paolo Bonzini
2020-01-23 13:48 ` [PULL 33/59] qdev: remove extraneous error Paolo Bonzini
2020-01-23 13:48 ` [PULL 34/59] qdev: move helper function to monitor/misc Paolo Bonzini
2020-01-23 13:48 ` [PULL 35/59] object: avoid extra class property key duplication Paolo Bonzini
2020-01-23 13:48 ` [PULL 36/59] object: add class property initializer Paolo Bonzini
2020-01-23 13:48 ` [PULL 37/59] object: add object_property_get_defaut() Paolo Bonzini
2020-01-23 13:48 ` Paolo Bonzini [this message]
2020-01-23 13:48 ` [PULL 39/59] qstring: add qstring_free() Paolo Bonzini
2020-01-23 13:48 ` [PULL 40/59] object: add object_property_set_defaut_{bool, str, int, uint}() Paolo Bonzini
2020-01-23 13:48 ` [PULL 41/59] object: do not free class properties Paolo Bonzini
2020-01-23 13:48 ` [PULL 42/59] object: check strong flag with & Paolo Bonzini
2020-01-23 13:48 ` [PULL 43/59] object: rename link "child" to "target" Paolo Bonzini
2020-01-23 13:48 ` [PULL 44/59] object: add direct link flag Paolo Bonzini
2020-01-23 13:48 ` [PULL 45/59] object: express const link with link property Paolo Bonzini
2020-01-23 13:48 ` [PULL 46/59] object: add object_class_property_add_link() Paolo Bonzini
2020-01-23 13:48 ` [PULL 47/59] object: release all props Paolo Bonzini
2020-01-23 13:48 ` [PULL 48/59] object: return self in object_ref() Paolo Bonzini
2020-01-23 13:48 ` [PULL 49/59] qdev: set properties with device_class_set_props() Paolo Bonzini
2020-01-23 13:48 ` [PULL 50/59] qdev: move instance properties to class properties Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1579787342-27146-39-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).