From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UulH4-0003Ru-Q0 for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:16:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UulH3-00067q-JR for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:16:46 -0400 Received: from mail-wi0-x22b.google.com ([2a00:1450:400c:c05::22b]:44235) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UulH3-00067k-EG for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:16:45 -0400 Received: by mail-wi0-f171.google.com with SMTP id hj3so6428859wib.16 for ; Thu, 04 Jul 2013 08:16:44 -0700 (PDT) Received: from playground.station (net-37-117-148-210.cust.dsl.vodafone.it. [37.117.148.210]) by mx.google.com with ESMTPSA id d8sm4212546wiz.0.2013.07.04.08.16.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Jul 2013 08:16:44 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 4 Jul 2013 17:14:01 +0200 Message-Id: <1372950842-32422-66-git-send-email-pbonzini@redhat.com> In-Reply-To: <1372950842-32422-1-git-send-email-pbonzini@redhat.com> References: <1372950842-32422-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 65/66] exec: remove cur_map List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org cur_map is not used anymore; instead, each AddressSpaceDispatch has its own nodes/sections pair. The priorities of the MemoryListeners, and in the future RCU, guarantee that the nodes/sections are not freed while they are still in use. (In fact, next_map itself is not needed except to free the data on the next update). To avoid incorrect use, replace cur_map with a temporary copy that is only valid while the topology is being updated. If you use it, the name prev_map makes it clear that you're doing something weird. Signed-off-by: Paolo Bonzini --- exec.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/exec.c b/exec.c index 6d3492e..7a6d969 100644 --- a/exec.c +++ b/exec.c @@ -122,7 +122,7 @@ typedef struct PhysPageMap { MemoryRegionSection *sections; } PhysPageMap; -static PhysPageMap cur_map; +static PhysPageMap *prev_map; static PhysPageMap next_map; #define PHYS_MAP_NODE_NIL (((uint16_t)~0) >> 1) @@ -790,7 +790,7 @@ static void phys_section_destroy(MemoryRegion *mr) } } -static void phys_sections_clear(PhysPageMap *map) +static void phys_sections_free(PhysPageMap *map) { while (map->sections_nb > 0) { MemoryRegionSection *section = &map->sections[--map->sections_nb]; @@ -798,6 +798,7 @@ static void phys_sections_clear(PhysPageMap *map) } g_free(map->sections); g_free(map->nodes); + g_free(map); } static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection *section) @@ -1731,6 +1732,9 @@ static void core_begin(MemoryListener *listener) { uint16_t n; + prev_map = g_new(PhysPageMap, 1); + *prev_map = next_map; + memset(&next_map, 0, sizeof(next_map)); n = dummy_section(&io_mem_unassigned); assert(n == PHYS_SECTION_UNASSIGNED); @@ -1747,9 +1751,7 @@ static void core_begin(MemoryListener *listener) */ static void core_commit(MemoryListener *listener) { - PhysPageMap info = cur_map; - cur_map = next_map; - phys_sections_clear(&info); + phys_sections_free(prev_map); } static void tcg_commit(MemoryListener *listener) -- 1.8.1.4