aboutsummaryrefslogtreecommitdiff
path: root/qom/object.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-12-23 09:08:05 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-02-03 10:41:08 -0600
commit8b45d447ce5cce07cbdf0f42b969137430284d5c (patch)
tree8732080bdc35de9f5399db2244e7904ffaf647b5 /qom/object.c
parentdb85b575b9f29487d1dd854da730a9293d91198a (diff)
container: make a decendent of Object
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> --- v1 -> v2 - Add license (Paolo)
Diffstat (limited to 'qom/object.c')
-rw-r--r--qom/object.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/qom/object.c b/qom/object.c
index 33217b820f..4261944849 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -662,14 +662,13 @@ const char *object_property_get_type(Object *obj, const char *name, Error **errp
Object *object_get_root(void)
{
- static DeviceState *object_root;
+ static Object *root;
- if (!object_root) {
- object_root = qdev_create(NULL, "container");
- qdev_init_nofail(object_root);
+ if (!root) {
+ root = object_new("container");
}
- return OBJECT(object_root);
+ return root;
}
static void object_get_child_property(Object *obj, Visitor *v, void *opaque,