[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/21] qdev: push "type" property up to Object
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 06/21] qdev: push "type" property up to Object |
Date: |
Wed, 2 May 2012 13:30:58 +0200 |
Now that Object is a type, add an instance_init function and push
the "type" property from qdev to there.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/qdev.c | 6 ------
qom/object.c | 11 +++++++++++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index 0bcde20..94fb32e 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -515,11 +515,6 @@ char* qdev_get_fw_dev_path(DeviceState *dev)
return strdup(path);
}
-static char *qdev_get_type(Object *obj, Error **errp)
-{
- return g_strdup(object_get_typename(obj));
-}
-
/**
* Legacy property handling
*/
@@ -635,7 +630,6 @@ static void device_initfn(Object *obj)
qdev_property_add_static(dev, prop, NULL);
}
- object_property_add_str(OBJECT(dev), "type", qdev_get_type, NULL, NULL);
qdev_prop_set_defaults(dev, qdev_get_props(dev));
}
diff --git a/qom/object.c b/qom/object.c
index e536ece..464fc8f 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1204,6 +1204,16 @@ void object_property_add_str(Object *obj, const char
*name,
prop, errp);
}
+static char *qdev_get_type(Object *obj, Error **errp)
+{
+ return g_strdup(object_get_typename(obj));
+}
+
+static void object_instance_init(Object *obj)
+{
+ object_property_add_str(obj, "type", qdev_get_type, NULL, NULL);
+}
+
static void register_types(void)
{
static TypeInfo interface_info = {
@@ -1215,6 +1225,7 @@ static void register_types(void)
static TypeInfo object_info = {
.name = TYPE_OBJECT,
.instance_size = sizeof(Object),
+ .instance_init = object_instance_init,
.abstract = true,
};
--
1.7.9.3
- Re: [Qemu-devel] [PATCH 01/21] qom: documentation addition, (continued)
[Qemu-devel] [PATCH 05/21] qom: assert that public types have a non-NULL parent field, Paolo Bonzini, 2012/05/02
[Qemu-devel] [PATCH 07/21] qdev: fix -device foo,?, Paolo Bonzini, 2012/05/02