From patchwork Fri Aug 24 09:49:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 179811 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 24EDF2C0100 for ; Fri, 24 Aug 2012 20:15:28 +1000 (EST) Received: from localhost ([::1]:40127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qY5-0004kR-ES for incoming@patchwork.ozlabs.org; Fri, 24 Aug 2012 05:51:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qXb-0003Sk-MR for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:51:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T4qXa-000381-Jz for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:50:59 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:48876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qXa-00037L-Ex for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:50:58 -0400 Received: by obbta14 with SMTP id ta14so3534267obb.4 for ; Fri, 24 Aug 2012 02:50:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=1Zo/sL2XptSSYR/bHhBADrNXdFGX/fOd5KzR9uYfJF8=; b=pvfjpjjaXBMuLgWFyd7fRZfy3CIk1Too59BnR0h17hjrzHKvIHDy7FjvPQXpmGQ9OB DLNccAcmPJIEkGSX1KisnVTUR/8k2pWDEWYLr2G7WcrDrFade8Qe6ArxG5zidamyJu98 P2RsvpVpDB6Ro4KRSR5sM/6wi8U57+0HiTcwJPXE/PdMvlMb3BJWT+rpUu9BckxZrCaS 6z3ieXxrxqAeBCEL6eZMIGo4jgXzdsjCF9CZFg5/hP32NqHVsoZc48xzXYcHW7a4M338 qpaAq/b53wFOTGa5FUMDCUZqUTCROgPbVDZyjswgOHZvvQZFvSaTvYNAfoqjDmAalVN3 4Odw== Received: by 10.182.174.100 with SMTP id br4mr80333obc.62.1345801856814; Fri, 24 Aug 2012 02:50:56 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPS id c6sm8931326obn.13.2012.08.24.02.50.54 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Aug 2012 02:50:56 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Fri, 24 Aug 2012 17:49:18 +0800 Message-Id: <1345801763-24227-6-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1345801763-24227-1-git-send-email-qemulist@gmail.com> References: <1345801763-24227-1-git-send-email-qemulist@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.173 Cc: Paolo Bonzini , Liu Ping Fan , Avi Kivity , Anthony Liguori Subject: [Qemu-devel] [PATCH 05/10] qdev: finalize of qbus, qdev will not the right place to free children X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Liu Ping Fan When breaking big lock, the child object can be hold by mmio-dispatch, and it is not right to free them when their parent gone. We will isolate and release the children by qdev_delete_subtree(), and let each object manage its own life cycle. Signed-off-by: Liu Ping Fan --- hw/qdev.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 570f0bf..d6c8130 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -756,10 +756,8 @@ static void device_finalize(Object *obj) DeviceClass *dc = DEVICE_GET_CLASS(dev); if (dev->state == DEV_STATE_INITIALIZED) { - while (dev->num_child_bus) { - bus = QLIST_FIRST(&dev->child_bus); - qbus_free(bus); - } + + g_assert(QLIST_EMPTY(&dev->child_bus)); if (qdev_get_vmsd(dev)) { vmstate_unregister(dev, qdev_get_vmsd(dev), dev); } @@ -770,9 +768,8 @@ static void device_finalize(Object *obj) qemu_opts_del(dev->opts); } } - if (dev->parent_bus) { - bus_remove_child(dev->parent_bus, dev); - } + + g_assert((dev->parent_bus == NULL)); } static void device_class_base_init(ObjectClass *class, void *data) @@ -826,19 +823,16 @@ static void qbus_initfn(Object *obj) static void qbus_finalize(Object *obj) { BusState *bus = BUS(obj); - BusChild *kid; - while ((kid = QTAILQ_FIRST(&bus->children)) != NULL) { - DeviceState *dev = kid->child; - qdev_free(dev); - } - if (bus->parent) { - QLIST_REMOVE(bus, sibling); - bus->parent->num_child_bus--; - } else { - assert(bus != sysbus_get_default()); /* main_system_bus is never freed */ - qemu_unregister_reset(qbus_reset_all_fn, bus); + assert(bus != sysbus_get_default()); /* main_system_bus is never freed */ + /* just blind check, since bus->parent has been set to NULL */ + qemu_unregister_reset(qbus_reset_all_fn, bus); + if (bus->overlap != NULL) { + object_unref(OBJECT(bus->overlap)); } + assert(QTAILQ_EMPTY(&bus->children)); + /* have reset it to NULL, to prevent reader */ + assert((bus->parent == NULL)); g_free((char *)bus->name); }