From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuoWe-0004eH-Qw for qemu-devel@nongnu.org; Fri, 06 Nov 2015 16:26:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZuoWd-0006Kg-V2 for qemu-devel@nongnu.org; Fri, 06 Nov 2015 16:26:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46397) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuoWd-0006Kc-Pf for qemu-devel@nongnu.org; Fri, 06 Nov 2015 16:26:23 -0500 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 (Postfix) with ESMTPS id 6B661264A for ; Fri, 6 Nov 2015 21:26:23 +0000 (UTC) From: Eduardo Habkost Date: Fri, 6 Nov 2015 19:20:05 -0200 Message-Id: <1446844805-14492-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1446844805-14492-1-git-send-email-ehabkost@redhat.com> References: <1446844805-14492-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] memory: Eliminate memory_region_destructor_ram_from_ptr() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org The function is equivalent to memory_region_destructor_ram(), so it's not needed anymore. Signed-off-by: Eduardo Habkost --- memory.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/memory.c b/memory.c index 183eca5..57d7d33 100644 --- a/memory.c +++ b/memory.c @@ -859,11 +859,6 @@ static void memory_region_destructor_ram(MemoryRegion *mr) qemu_ram_free(mr->ram_addr); } -static void memory_region_destructor_ram_from_ptr(MemoryRegion *mr) -{ - qemu_ram_free(mr->ram_addr); -} - static void memory_region_destructor_rom_device(MemoryRegion *mr) { qemu_ram_free(mr->ram_addr & TARGET_PAGE_MASK); @@ -1246,7 +1241,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; mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ -- 2.1.0