From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPXnS-000514-Pp for qemu-devel@nongnu.org; Wed, 02 May 2012 07:32:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPXnQ-0000QM-V2 for qemu-devel@nongnu.org; Wed, 02 May 2012 07:32:38 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:48124) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPXnQ-0000FY-N5 for qemu-devel@nongnu.org; Wed, 02 May 2012 07:32:36 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so1148607pbb.4 for ; Wed, 02 May 2012 04:32:35 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 2 May 2012 13:31:11 +0200 Message-Id: <1335958273-769-20-git-send-email-pbonzini@redhat.com> In-Reply-To: <1335958273-769-1-git-send-email-pbonzini@redhat.com> References: <1335958273-769-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 19/21] qdev: connect busses with their parent devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, liwp@linux.vnet.ibm.com, afaerber@suse.de From: Anthony Liguori This makes sysbus part of the root hierarchy and all busses children of their respective parent DeviceState. Signed-off-by: Anthony Liguori Signed-off-by: Paolo Bonzini --- hw/qdev.c | 4 ++++ hw/sysbus.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/hw/qdev.c b/hw/qdev.c index b97ba00..decbcb1 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -404,6 +404,7 @@ static void do_qbus_create_inplace(BusState *bus, const char *typename, if (parent) { QLIST_INSERT_HEAD(&parent->child_bus, bus, sibling); parent->num_child_bus++; + object_property_add_child(OBJECT(parent), bus->name, OBJECT(bus), NULL); } else if (bus != sysbus_get_default()) { /* TODO: once all bus devices are qdevified, only reset handler for main_system_bus should be registered here. */ @@ -651,6 +652,9 @@ static void device_initfn(Object *obj) class = object_class_get_parent(class); } while (class != object_class_by_name(TYPE_DEVICE)); qdev_prop_set_globals(dev); + + object_property_add_link(OBJECT(dev), "parent_bus", TYPE_BUS, + (Object **)&dev->parent_bus, NULL); } /* Unlink device from bus and free the structure. */ diff --git a/hw/sysbus.c b/hw/sysbus.c index f10a7d1..417fbd4 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -275,6 +275,9 @@ static void main_system_bus_create(void) qbus_create_inplace(main_system_bus, TYPE_SYSTEM_BUS, NULL, "main-system-bus"); main_system_bus->qdev_allocated = 1; + object_property_add_child(container_get(qdev_get_machine(), + "/unattached"), + "sysbus", OBJECT(main_system_bus), NULL); } BusState *sysbus_get_default(void) -- 1.7.9.3