david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdev: refactor away qdev_create_from_info

Browse Source 
Note that the FIXME gets fixed in series 4/4.  We need to convert BusState to
QOM before we can make parent_bus a link.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2011-12-22 15:14:27 -06:00
parent 9674bfe420
commit 9fbe61277f
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hw/qdev.c
View File

@ -124,30 +124,22 @@ bool qdev_exists(const char *name)
static void qdev_property_add_legacy(DeviceState *dev, Property *prop, static void qdev_property_add_legacy(DeviceState *dev, Property *prop,
Error **errp); Error **errp);
static DeviceState *qdev_create_from_info(BusState *bus, const char *typename) void qdev_set_parent_bus(DeviceState *dev, BusState *bus)
{ {
DeviceState *dev;
Property *prop; Property *prop;
dev = DEVICE(object_new(typename));
dev->parent_bus = bus;
qdev_prop_set_defaults(dev, dev->parent_bus->info->props);
if (qdev_hotplug) { if (qdev_hotplug) {
assert(bus->allow_hotplug); assert(bus->allow_hotplug);
} }
dev->parent_bus = bus;
QTAILQ_INSERT_HEAD(&bus->children, dev, sibling); QTAILQ_INSERT_HEAD(&bus->children, dev, sibling);
qdev_prop_set_defaults(dev, dev->parent_bus->info->props);
for (prop = qdev_get_bus_info(dev)->props; prop && prop->name; prop++) { for (prop = qdev_get_bus_info(dev)->props; prop && prop->name; prop++) {
qdev_property_add_legacy(dev, prop, NULL); qdev_property_add_legacy(dev, prop, NULL);
qdev_property_add_static(dev, prop, NULL); qdev_property_add_static(dev, prop, NULL);
} }
qdev_prop_set_globals(dev);
return dev;
} }
/* Create a new device. This only initializes the device state structure /* Create a new device. This only initializes the device state structure
@ -172,11 +164,21 @@ DeviceState *qdev_create(BusState *bus, const char *name)
DeviceState *qdev_try_create(BusState *bus, const char *name) DeviceState *qdev_try_create(BusState *bus, const char *name)
{ {
DeviceState *dev;
dev = DEVICE(object_new(name));
if (!dev) {
return NULL;
}
if (!bus) { if (!bus) {
bus = sysbus_get_default(); bus = sysbus_get_default();
} }
return qdev_create_from_info(bus, name); qdev_set_parent_bus(dev, bus);
qdev_prop_set_globals(dev);
return dev;
} }
static void qdev_print_devinfo(ObjectClass *klass, void *opaque) static void qdev_print_devinfo(ObjectClass *klass, void *opaque)
@ -373,8 +375,15 @@ DeviceState *qdev_device_add(QemuOpts *opts)
return NULL; return NULL;
} }
if (!bus) {
bus = sysbus_get_default();
}
/* create device, set properties */ /* create device, set properties */
qdev = qdev_create_from_info(bus, driver); qdev = DEVICE(object_new(driver));
qdev_set_parent_bus(qdev, bus);
qdev_prop_set_globals(qdev);
id = qemu_opts_id(opts); id = qemu_opts_id(opts);
if (id) { if (id) {
qdev->id = id; qdev->id = id;

3
hw/qdev.h
View File

@ -643,4 +643,7 @@ BusInfo *qdev_get_bus_info(DeviceState *dev);
Property *qdev_get_props(DeviceState *dev); Property *qdev_get_props(DeviceState *dev);
/* FIXME: make this a link<> */
void qdev_set_parent_bus(DeviceState *dev, BusState *bus);
#endif #endif