From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF1kB-0002mQ-Bb for qemu-devel@nongnu.org; Tue, 03 Apr 2012 07:17:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF1k1-0003VG-PI for qemu-devel@nongnu.org; Tue, 03 Apr 2012 07:17:44 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:59641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF1k1-00038a-Gj for qemu-devel@nongnu.org; Tue, 03 Apr 2012 07:17:37 -0400 Received: by mail-pz0-f46.google.com with SMTP id z9so4190452dad.33 for ; Tue, 03 Apr 2012 04:17:33 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Apr 2012 13:15:53 +0200 Message-Id: <1333451753-3550-26-git-send-email-pbonzini@redhat.com> In-Reply-To: <1333451753-3550-1-git-send-email-pbonzini@redhat.com> References: <1333451753-3550-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 25/25] qdev: split part of device_finalize to device_unrealize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, afaerber@suse.de Signed-off-by: Paolo Bonzini --- hw/qdev.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index e674248..45f1133 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -601,27 +601,31 @@ static void device_initfn(Object *obj) } /* Unlink device from bus and free the structure. */ -static void device_finalize(Object *obj) +static void device_unrealize(Object *obj) { DeviceState *dev = DEVICE(obj); BusState *bus; DeviceClass *dc = DEVICE_GET_CLASS(dev); - if (object_is_realized(obj)) { - while (dev->num_child_bus) { - bus = QLIST_FIRST(&dev->child_bus); - qbus_free(bus); - } - if (qdev_get_vmsd(dev)) { - vmstate_unregister(dev, qdev_get_vmsd(dev), dev); - } - if (dc->exit) { - dc->exit(dev); - } - if (dev->opts) { - qemu_opts_del(dev->opts); - } + while (dev->num_child_bus) { + bus = QLIST_FIRST(&dev->child_bus); + qbus_free(bus); + } + if (qdev_get_vmsd(dev)) { + vmstate_unregister(dev, qdev_get_vmsd(dev), dev); } + if (dc->exit) { + dc->exit(dev); + } + if (dev->opts) { + qemu_opts_del(dev->opts); + } +} + +static void device_finalize(Object *obj) +{ + DeviceState *dev = DEVICE(obj); + QTAILQ_REMOVE(&dev->parent_bus->children, dev, sibling); } @@ -649,6 +653,7 @@ static void device_class_init(ObjectClass *klass, void *data) { klass->realize = device_realize; klass->realize_children = device_realize_children; + klass->unrealize = device_unrealize; } static TypeInfo device_type_info = { -- 1.7.9.3