From patchwork Fri Aug 24 09:49:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 179805 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 A2B072C0143 for ; Fri, 24 Aug 2012 19:51:11 +1000 (EST) Received: from localhost ([::1]:37769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qXl-0003UZ-QR for incoming@patchwork.ozlabs.org; Fri, 24 Aug 2012 05:51:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qXZ-0003Lz-Dl for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:50:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T4qXT-0002zu-GP for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:50:57 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:64630) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qXT-0002zm-2N for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:50:51 -0400 Received: by pbbjt11 with SMTP id jt11so3137858pbb.4 for ; Fri, 24 Aug 2012 02:50:50 -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=zO72x9vfCxv5t4JrQblBH5D0vja2yPfgAQ6zsClUkYY=; b=zNHIXJa1SsT45zuqPLAfxifmNBZ6iwDGWJ3W5EYxGLUxp+LmtW40tE3OUcCZpEeTsa q62Cez4NBKbCRxtmJWn1MEQoUahmG0jpz9O0VCtmAq+G+pp5UlE2kMUF56od3+AxfWZh E4wxb7Rja9jj1sdqbvD2qQIP2fSi1Dg+zG73F2qmzPxocqB46frUL6DXIYWo64z184OA tYfaovdij1eUQ0xxYwXkJbMlGtjBzH/KeEiWIFGLZIsXU9+B2PnZPcQeAyJ8LVztuKvF WFhNwa8DiHEMzYjdl24GO5irKSssN3MXnIN/bGffHBfhiq50nnTSPwW7XAYyOqhS8PXW n1dg== Received: by 10.68.201.198 with SMTP id kc6mr11406685pbc.122.1345801850154; Fri, 24 Aug 2012 02:50:50 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPS id pj10sm7979332pbb.46.2012.08.24.02.50.47 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Aug 2012 02:50:49 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Fri, 24 Aug 2012 17:49:17 +0800 Message-Id: <1345801763-24227-5-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.160.45 Cc: Paolo Bonzini , Liu Ping Fan , Avi Kivity , Anthony Liguori Subject: [Qemu-devel] [PATCH 04/10] qdev: introduce new interface to remove composite sub-tree 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 a bridge device removed, all the children bebind it should be removed. Using qdev_delete_subtree(dev) to emulate this event. And it is achieved by iterated laughed by qdev_walk_children() Signed-off-by: Liu Ping Fan --- hw/qdev.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ hw/qdev.h | 1 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index ad618dd..570f0bf 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -239,6 +239,50 @@ void qbus_reset_all_fn(void *opaque) qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL, 0); } +static int qdev_device_delete(DeviceState *dev, void *opaque) +{ + Object *obj = OBJECT(dev); + BusState *b = dev->parent_bus; + + dev->parent_bus = NULL; + /* removed from list and bus->dev link */ + bus_remove_child(b, dev); + /* remove bus<-dev link */ + object_property_del(OBJECT(dev), "parent_bus", NULL); + + /* when mmio-dispatch out of big lock, remove it! + * refcnt hold by + * object_property_add_child(qdev_get_peripheral(), ., OBJECT(qdev),..) + * should be released before here. + */ + g_assert(obj->ref == 1); + object_unref(OBJECT(dev)); + + return 0; +} + +static int qdev_bus_delete(BusState *bus, void *opaque) +{ + Object *obj = OBJECT(bus); + DeviceState *d = bus->parent; + + bus->parent = NULL; + QLIST_REMOVE(bus, sibling); + d->num_child_bus--; + object_property_del_child(OBJECT(d), OBJECT(bus), NULL); + /* when mmio-dispatch out of big lock, remove it!*/ + g_assert(obj->ref == 1); + object_unref(obj); + + return 0; +} + +/* Delete the composite tree which starts from @dev */ +void qdev_delete_subtree(DeviceState *dev) +{ + qdev_walk_children(dev, qdev_device_delete, qdev_bus_delete, NULL, 1); +} + /* can be used as ->unplug() callback for the simple cases */ int qdev_simple_unplug_cb(DeviceState *dev) { diff --git a/hw/qdev.h b/hw/qdev.h index 9fc8b46..6f97990 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -162,6 +162,7 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, int required_for_version); void qdev_unplug(DeviceState *dev, Error **errp); void qdev_free(DeviceState *dev); +void qdev_delete_subtree(DeviceState *dev); int qdev_simple_unplug_cb(DeviceState *dev); void qdev_machine_creation_done(void); bool qdev_machine_modified(void);