[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 3/7] rng: register properties against the class
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH RFC 3/7] rng: register properties against the class instead of object |
Date: |
Wed, 26 Aug 2015 13:03:10 +0100 |
This converts the rng, rng-egd & rng-random objects to register
their properties against the class rather than object.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
backends/rng-egd.c | 12 ++++--------
backends/rng-random.c | 10 +++++-----
backends/rng.c | 14 +++++---------
3 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index 6c13409..8b2a9dc 100644
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -186,13 +186,6 @@ static char *rng_egd_get_chardev(Object *obj, Error **errp)
return NULL;
}
-static void rng_egd_init(Object *obj)
-{
- object_property_add_str(obj, "chardev",
- rng_egd_get_chardev, rng_egd_set_chardev,
- NULL);
-}
-
static void rng_egd_finalize(Object *obj)
{
RngEgd *s = RNG_EGD(obj);
@@ -214,6 +207,10 @@ static void rng_egd_class_init(ObjectClass *klass, void
*data)
rbc->request_entropy = rng_egd_request_entropy;
rbc->cancel_requests = rng_egd_cancel_requests;
rbc->opened = rng_egd_opened;
+
+ object_class_property_add_str(klass, "chardev",
+ rng_egd_get_chardev, rng_egd_set_chardev,
+ NULL);
}
static const TypeInfo rng_egd_info = {
@@ -221,7 +218,6 @@ static const TypeInfo rng_egd_info = {
.parent = TYPE_RNG_BACKEND,
.instance_size = sizeof(RngEgd),
.class_init = rng_egd_class_init,
- .instance_init = rng_egd_init,
.instance_finalize = rng_egd_finalize,
};
diff --git a/backends/rng-random.c b/backends/rng-random.c
index 4e51f46..175c61b 100644
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -110,11 +110,6 @@ static void rng_random_init(Object *obj)
{
RndRandom *s = RNG_RANDOM(obj);
- object_property_add_str(obj, "filename",
- rng_random_get_filename,
- rng_random_set_filename,
- NULL);
-
s->filename = g_strdup("/dev/random");
s->fd = -1;
}
@@ -137,6 +132,11 @@ static void rng_random_class_init(ObjectClass *klass, void
*data)
rbc->request_entropy = rng_random_request_entropy;
rbc->opened = rng_random_opened;
+
+ object_class_property_add_str(klass, "filename",
+ rng_random_get_filename,
+ rng_random_set_filename,
+ NULL);
}
static const TypeInfo rng_random_info = {
diff --git a/backends/rng.c b/backends/rng.c
index 5065fdc..c9c0632 100644
--- a/backends/rng.c
+++ b/backends/rng.c
@@ -72,26 +72,22 @@ static void rng_backend_prop_set_opened(Object *obj, bool
value, Error **errp)
s->opened = true;
}
-static void rng_backend_init(Object *obj)
-{
- object_property_add_bool(obj, "opened",
- rng_backend_prop_get_opened,
- rng_backend_prop_set_opened,
- NULL);
-}
-
static void rng_backend_class_init(ObjectClass *oc, void *data)
{
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
ucc->complete = rng_backend_complete;
+
+ object_class_property_add_bool(oc, "opened",
+ rng_backend_prop_get_opened,
+ rng_backend_prop_set_opened,
+ NULL);
}
static const TypeInfo rng_backend_info = {
.name = TYPE_RNG_BACKEND,
.parent = TYPE_OBJECT,
.instance_size = sizeof(RngBackend),
- .instance_init = rng_backend_init,
.class_size = sizeof(RngBackendClass),
.class_init = rng_backend_class_init,
.abstract = true,
--
2.4.3
- [Qemu-devel] [PATCH RFC 0/7] Making QOM introspectable, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 3/7] rng: register properties against the class instead of object,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH RFC 4/7] tpm: register properties against the class instead of object, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 1/7] qom: allow properties to be registered against classes, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 2/7] hostmem: register properties against the class instead of object, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 6/7] x86-cpu: register properties against the class instead of object, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 5/7] cpu: avoid using object instance state in property getter, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 7/7] machine: register properties against the class instead of object, Daniel P. Berrange, 2015/08/26