From da57febfed7bad11be79f047b59719c38abd0712 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 27 Mar 2012 18:38:47 +0200 Subject: [PATCH] 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 Signed-off-by: Paolo Bonzini Signed-off-by: Anthony Liguori --- hw/qdev.c | 16 +++++++++++++--- 1 file 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, -- GitLab