container: make a decendent of Object

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
v1 -> v2
 - Add license (Paolo)
This commit is contained in:
Anthony Liguori 2011-12-23 09:08:05 -06:00
parent db85b575b9
commit 8b45d447ce
6 changed files with 39 additions and 44 deletions

View file

@ -1 +1 @@
qom-y = object.o
qom-y = object.o container.o

27
qom/container.c Normal file
View file

@ -0,0 +1,27 @@
/*
* Device Container
*
* Copyright IBM, Corp. 2012
*
* Authors:
* Anthony Liguori <aliguori@us.ibm.com>
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#include "qemu/object.h"
#include "module.h"
static TypeInfo container_info = {
.name = "container",
.instance_size = sizeof(Object),
.parent = TYPE_OBJECT,
};
static void container_init(void)
{
type_register_static(&container_info);
}
device_init(container_init);

View file

@ -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,