[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/45] exec: Remove unnecessary RAM_FILE flag
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/45] exec: Remove unnecessary RAM_FILE flag |
Date: |
Thu, 17 Dec 2015 18:45:59 +0100 |
From: Eduardo Habkost <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PULL 00/45] KVM, memory, SCSI, qemu_log, Coverity patches for 2015-12-17, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 02/45] memory: Eliminate memory_region_destructor_ram_from_ptr(), Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 01/45] exec: Eliminate qemu_ram_free_from_ptr(), Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 04/45] kvm-all: PAGE_SIZE should be real host page size, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 05/45] memory: emulate ioeventfd, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 03/45] exec: Remove unnecessary RAM_FILE flag,
Paolo Bonzini <=
- [Qemu-devel] [PULL 08/45] vmw_pvscsi: Introduce 'x-old-pci-configuration' backword compatability property, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 06/45] vmw_pvscsi: Set device subsystem and revision, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 09/45] vmw_pvscsi: coding: Introduce PVSCSIClass, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 07/45] vmw_pvscsi: Change offset of msi pci capability, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 10/45] vmw_pvscsi: The pvscsi device is a PCIE endpoint, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 11/45] vmw_pvscsi: Introduce 'x-disable-pcie' backword compatability property, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 14/45] kvm: Hyper-V SynIC irq routing support, Paolo Bonzini, 2015/12/17