From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1yph-0006LL-42 for qemu-devel@nongnu.org; Mon, 08 Jun 2015 11:19:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1ypf-00059v-0R for qemu-devel@nongnu.org; Mon, 08 Jun 2015 11:19:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51769) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1ype-00059Q-R0 for qemu-devel@nongnu.org; Mon, 08 Jun 2015 11:19:22 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 8A4A82AFF6C for ; Mon, 8 Jun 2015 15:19:22 +0000 (UTC) From: Igor Mammedov Date: Mon, 8 Jun 2015 17:19:12 +0200 Message-Id: <1433776757-61958-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1433776757-61958-1-git-send-email-imammedo@redhat.com> References: <1433776757-61958-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [RFC v2 1/6] memory: get rid of memory_region_destructor_ram_from_ptr() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mst@redhat.com memory_region_destructor_ram_from_ptr() uses qemu_ram_free_from_ptr() to free RAMBlock without freeing host RAM but generic memory_region_destructor_ram() -> qemu_ram_free() does the same so reuse memory_region_destructor_ram() instead. Signed-off-by: Igor Mammedov --- exec.c | 19 ------------------- include/exec/ram_addr.h | 1 - memory.c | 7 +------ 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/exec.c b/exec.c index e19ab22..d895a86 100644 --- a/exec.c +++ b/exec.c @@ -1555,25 +1555,6 @@ ram_addr_t qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz, return qemu_ram_alloc_internal(size, maxsz, resized, NULL, true, mr, errp); } -void qemu_ram_free_from_ptr(ram_addr_t addr) -{ - RAMBlock *block; - - qemu_mutex_lock_ramlist(); - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { - if (addr == block->offset) { - QLIST_REMOVE_RCU(block, next); - ram_list.mru_block = NULL; - /* Write list before version */ - smp_wmb(); - ram_list.version++; - g_free_rcu(block, rcu); - break; - } - } - qemu_mutex_unlock_ramlist(); -} - static void reclaim_ramblock(RAMBlock *block) { if (block->flags & RAM_PREALLOC) { diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index ff558a4..56d2c17 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -37,7 +37,6 @@ int qemu_get_ram_fd(ram_addr_t addr); void *qemu_get_ram_block_host_ptr(ram_addr_t addr); void *qemu_get_ram_ptr(ram_addr_t addr); void qemu_ram_free(ram_addr_t addr); -void qemu_ram_free_from_ptr(ram_addr_t addr); int qemu_ram_resize(ram_addr_t base, ram_addr_t newsize, Error **errp); diff --git a/memory.c b/memory.c index 03c536b..929123f 100644 --- a/memory.c +++ b/memory.c @@ -869,11 +869,6 @@ static void memory_region_destructor_alias(MemoryRegion *mr) memory_region_unref(mr->alias); } -static void memory_region_destructor_ram_from_ptr(MemoryRegion *mr) -{ - qemu_ram_free_from_ptr(mr->ram_addr); -} - static void memory_region_destructor_rom_device(MemoryRegion *mr) { qemu_ram_free(mr->ram_addr & TARGET_PAGE_MASK); @@ -1252,7 +1247,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, memory_region_init(mr, owner, name, size); mr->ram = true; mr->terminates = true; - mr->destructor = memory_region_destructor_ram_from_ptr; + mr->destructor = memory_region_destructor_ram; /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ assert(ptr != NULL); -- 1.8.3.1