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

@@ -177,30 +177,28 @@ int qdev_device_help(QemuOpts *opts)
static Object *qdev_get_peripheral(void)
{
static DeviceState *dev;
static Object *dev;
if (dev == NULL) {
dev = qdev_create(NULL, "container");
dev = object_new("container");
object_property_add_child(object_get_root(), "peripheral",
OBJECT(dev), NULL);
qdev_init_nofail(dev);
}
return OBJECT(dev);
return dev;
}
static Object *qdev_get_peripheral_anon(void)
{
static DeviceState *dev;
static Object *dev;
if (dev == NULL) {
dev = qdev_create(NULL, "container");
dev = object_new("container");
object_property_add_child(object_get_root(), "peripheral-anon",
OBJECT(dev), NULL);
qdev_init_nofail(dev);
}
return OBJECT(dev);
return dev;
}
static void qbus_list_bus(DeviceState *dev)