From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9cdh-0000Io-4U for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:46:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9cdc-0006ir-4J for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:46:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43777) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9cdb-0006ih-UT for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:46:48 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 8D0B08F242 for ; Thu, 17 Dec 2015 17:46:47 +0000 (UTC) From: Paolo Bonzini Date: Thu, 17 Dec 2015 18:45:59 +0100 Message-Id: <1450374401-31352-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1450374401-31352-1-git-send-email-pbonzini@redhat.com> References: <1450374401-31352-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 03/45] exec: Remove unnecessary RAM_FILE flag List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost From: Eduardo Habkost The only code that sets RAMBlock.fd is file_ram_alloc(), and the only code that calls file_ram_alloc() sets the RAM_FILE flag. That means the flag is always set when RAMBlock.fd >= 0, and the munmap() call at reclaim_ramblock() is dead code that never runs. Signed-off-by: Eduardo Habkost Message-Id: <1446847881-9385-1-git-send-email-ehabkost@redhat.com> Signed-off-by: Paolo Bonzini --- exec.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/exec.c b/exec.c index d12cd42..53a4b8c 100644 --- a/exec.c +++ b/exec.c @@ -88,9 +88,6 @@ static MemoryRegion io_mem_unassigned; */ #define RAM_RESIZEABLE (1 << 2) -/* RAM is backed by an mmapped file. - */ -#define RAM_FILE (1 << 3) #endif struct CPUTailQ cpus = QTAILQ_HEAD_INITIALIZER(cpus); @@ -1601,7 +1598,6 @@ ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, new_block->used_length = size; new_block->max_length = size; new_block->flags = share ? RAM_SHARED : 0; - new_block->flags |= RAM_FILE; new_block->host = file_ram_alloc(new_block, size, mem_path, errp); if (!new_block->host) { @@ -1684,11 +1680,7 @@ static void reclaim_ramblock(RAMBlock *block) xen_invalidate_map_cache_entry(block->host); #ifndef _WIN32 } else if (block->fd >= 0) { - if (block->flags & RAM_FILE) { - qemu_ram_munmap(block->host, block->max_length); - } else { - munmap(block->host, block->max_length); - } + qemu_ram_munmap(block->host, block->max_length); close(block->fd); #endif } else { -- 2.5.0