From patchwork Wed Jun 25 12:25:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 363970 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0E1271400B9 for ; Wed, 25 Jun 2014 22:30:30 +1000 (EST) Received: from localhost ([::1]:37437 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzmLM-0002Kl-7a for incoming@patchwork.ozlabs.org; Wed, 25 Jun 2014 08:30:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzmHU-0004Bz-Gd for qemu-devel@nongnu.org; Wed, 25 Jun 2014 08:26:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzmHO-0001JN-HV for qemu-devel@nongnu.org; Wed, 25 Jun 2014 08:26:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40834) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzmHO-0001JH-9O for qemu-devel@nongnu.org; Wed, 25 Jun 2014 08:26:22 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5PCQLi0021367 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 25 Jun 2014 08:26:21 -0400 Received: from playground.com (ovpn-112-70.ams2.redhat.com [10.36.112.70]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5PCQ06b026682 for ; Wed, 25 Jun 2014 08:26:20 -0400 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 25 Jun 2014 14:25:54 +0200 Message-Id: <1403699158-4344-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403699158-4344-1-git-send-email-pbonzini@redhat.com> References: <1403699158-4344-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for 2.1 10/14] memory: MemoryRegion: replace owner field with QOM parent 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 The two are now the same. Reviewed-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- include/exec/memory.h | 1 - memory.c | 35 +++++++++++++++++++++++++---------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 85b56e2..0c7e825 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -141,7 +141,6 @@ struct MemoryRegion { const MemoryRegionOps *ops; const MemoryRegionIOMMUOps *iommu_ops; void *opaque; - struct Object *owner; MemoryRegion *container; Int128 size; hwaddr addr; diff --git a/memory.c b/memory.c index 9397fec..8970081 100644 --- a/memory.c +++ b/memory.c @@ -905,9 +905,11 @@ void memory_region_init(MemoryRegion *mr, const char *name, uint64_t size) { - object_initialize(mr, sizeof(*mr), TYPE_MEMORY_REGION); + if (!owner) { + owner = qdev_get_machine(); + } - mr->owner = owner ? owner : qdev_get_machine(); + object_initialize(mr, sizeof(*mr), TYPE_MEMORY_REGION); mr->size = int128_make64(size); if (size == UINT64_MAX) { mr->size = int128_2_64(); @@ -915,7 +917,7 @@ void memory_region_init(MemoryRegion *mr, mr->name = g_strdup(name); if (name) { - object_property_add_child_array(mr->owner, name, OBJECT(mr)); + object_property_add_child_array(owner, name, OBJECT(mr)); object_unref(OBJECT(mr)); } } @@ -1187,24 +1189,37 @@ void memory_region_destroy(MemoryRegion *mr) Object *memory_region_owner(MemoryRegion *mr) { - return mr->owner; + Object *obj = OBJECT(mr); + return obj->parent; } void memory_region_ref(MemoryRegion *mr) { - if (mr && mr->owner) { - object_ref(mr->owner); + /* MMIO callbacks most likely will access data that belongs + * to the owner, hence the need to ref/unref the owner whenever + * the memory region is in use. + * + * The memory region is a child of its owner. As long as the + * owner doesn't call unparent itself on the memory region, + * ref-ing the owner will also keep the memory region alive. + * Memory regions without an owner are supposed to never go away, + * but we still ref/unref them for debugging purposes. + */ + Object *obj = OBJECT(mr); + if (obj && obj->parent) { + object_ref(obj->parent); } else { - object_ref(OBJECT(mr)); + object_ref(obj); } } void memory_region_unref(MemoryRegion *mr) { - if (mr && mr->owner) { - object_unref(mr->owner); + Object *obj = OBJECT(mr); + if (obj && obj->parent) { + object_unref(obj->parent); } else { - object_unref(OBJECT(mr)); + object_unref(obj); } }