diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-03-27 18:38:47 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-02 15:04:15 -0500 |
| commit | da57febfed7bad11be79f047b59719c38abd0712 (patch) | |
| tree | 009c51fa6e882ddae92f8d685f8cf6c04ef986ae /hw/qdev.c | |
| parent | f424d5c4c9de67b56594384eac3c08dc33de9344 (diff) | |
| download | focaccia-qemu-da57febfed7bad11be79f047b59719c38abd0712.tar.gz focaccia-qemu-da57febfed7bad11be79f047b59719c38abd0712.zip | |
qdev: give all devices a canonical path
A strong limitation of QOM right now is that unconverted ports (e.g. all...) do not give a canonical path to devices that are part of the board. This in turn makes it impossible to replace PROP_PTR with a QOM link for example. Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/qdev.c')
| -rw-r--r-- | hw/qdev.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/hw/qdev.c b/hw/qdev.c index ee21d90e80..f5c716e87a 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -113,14 +113,14 @@ DeviceState *qdev_create(BusState *bus, const char *name) return dev; } -DeviceState *qdev_try_create(BusState *bus, const char *name) +DeviceState *qdev_try_create(BusState *bus, const char *type) { DeviceState *dev; - if (object_class_by_name(name) == NULL) { + if (object_class_by_name(type) == NULL) { return NULL; } - dev = DEVICE(object_new(name)); + dev = DEVICE(object_new(type)); if (!dev) { return NULL; } @@ -152,6 +152,16 @@ int qdev_init(DeviceState *dev) qdev_free(dev); return rc; } + + if (!OBJECT(dev)->parent) { + static int unattached_count = 0; + gchar *name = g_strdup_printf("device[%d]", unattached_count++); + + object_property_add_child(container_get("/unattached"), name, + OBJECT(dev), NULL); + g_free(name); + } + if (qdev_get_vmsd(dev)) { vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev), dev, dev->instance_id_alias, |