|
@@ -2275,6 +2275,23 @@ void qemu_ram_free(RAMBlock *block)
|
|
}
|
|
}
|
|
|
|
|
|
#ifndef _WIN32
|
|
#ifndef _WIN32
|
|
|
|
+/* Simply remap the given VM memory location from start to start+length */
|
|
|
|
+static int qemu_ram_remap_mmap(RAMBlock *block, uint64_t start, size_t length)
|
|
|
|
+{
|
|
|
|
+ int flags, prot;
|
|
|
|
+ void *area;
|
|
|
|
+ void *host_startaddr = block->host + start;
|
|
|
|
+
|
|
|
|
+ assert(block->fd < 0);
|
|
|
|
+ flags = MAP_FIXED | MAP_ANONYMOUS;
|
|
|
|
+ flags |= block->flags & RAM_SHARED ? MAP_SHARED : MAP_PRIVATE;
|
|
|
|
+ flags |= block->flags & RAM_NORESERVE ? MAP_NORESERVE : 0;
|
|
|
|
+ prot = PROT_READ;
|
|
|
|
+ prot |= block->flags & RAM_READONLY ? 0 : PROT_WRITE;
|
|
|
|
+ area = mmap(host_startaddr, length, prot, flags, -1, 0);
|
|
|
|
+ return area != host_startaddr ? -errno : 0;
|
|
|
|
+}
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* qemu_ram_remap - remap a single RAM page
|
|
* qemu_ram_remap - remap a single RAM page
|
|
*
|
|
*
|
|
@@ -2292,9 +2309,7 @@ void qemu_ram_remap(ram_addr_t addr)
|
|
{
|
|
{
|
|
RAMBlock *block;
|
|
RAMBlock *block;
|
|
uint64_t offset;
|
|
uint64_t offset;
|
|
- int flags;
|
|
|
|
- void *area, *vaddr;
|
|
|
|
- int prot;
|
|
|
|
|
|
+ void *vaddr;
|
|
size_t page_size;
|
|
size_t page_size;
|
|
|
|
|
|
RAMBLOCK_FOREACH(block) {
|
|
RAMBLOCK_FOREACH(block) {
|
|
@@ -2310,24 +2325,24 @@ void qemu_ram_remap(ram_addr_t addr)
|
|
} else if (xen_enabled()) {
|
|
} else if (xen_enabled()) {
|
|
abort();
|
|
abort();
|
|
} else {
|
|
} else {
|
|
- flags = MAP_FIXED;
|
|
|
|
- flags |= block->flags & RAM_SHARED ?
|
|
|
|
- MAP_SHARED : MAP_PRIVATE;
|
|
|
|
- flags |= block->flags & RAM_NORESERVE ? MAP_NORESERVE : 0;
|
|
|
|
- prot = PROT_READ;
|
|
|
|
- prot |= block->flags & RAM_READONLY ? 0 : PROT_WRITE;
|
|
|
|
- if (block->fd >= 0) {
|
|
|
|
- area = mmap(vaddr, page_size, prot, flags, block->fd,
|
|
|
|
- offset + block->fd_offset);
|
|
|
|
- } else {
|
|
|
|
- flags |= MAP_ANONYMOUS;
|
|
|
|
- area = mmap(vaddr, page_size, prot, flags, -1, 0);
|
|
|
|
- }
|
|
|
|
- if (area != vaddr) {
|
|
|
|
- error_report("Could not remap RAM %s:%" PRIx64 "+%" PRIx64
|
|
|
|
- " +%zx", block->idstr, offset,
|
|
|
|
- block->fd_offset, page_size);
|
|
|
|
- exit(1);
|
|
|
|
|
|
+ if (ram_block_discard_range(block, offset, page_size) != 0) {
|
|
|
|
+ /*
|
|
|
|
+ * Fall back to using mmap() only for anonymous mapping,
|
|
|
|
+ * as if a backing file is associated we may not be able
|
|
|
|
+ * to recover the memory in all cases.
|
|
|
|
+ * So don't take the risk of using only mmap and fail now.
|
|
|
|
+ */
|
|
|
|
+ if (block->fd >= 0) {
|
|
|
|
+ error_report("Could not remap RAM %s:%" PRIx64 "+%"
|
|
|
|
+ PRIx64 " +%zx", block->idstr, offset,
|
|
|
|
+ block->fd_offset, page_size);
|
|
|
|
+ exit(1);
|
|
|
|
+ }
|
|
|
|
+ if (qemu_ram_remap_mmap(block, offset, page_size) != 0) {
|
|
|
|
+ error_report("Could not remap RAM %s:%" PRIx64 " +%zx",
|
|
|
|
+ block->idstr, offset, page_size);
|
|
|
|
+ exit(1);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
memory_try_enable_merging(vaddr, page_size);
|
|
memory_try_enable_merging(vaddr, page_size);
|
|
qemu_ram_setup_dump(vaddr, page_size);
|
|
qemu_ram_setup_dump(vaddr, page_size);
|