[v5,2/5] Support adding a file to qemu's ram allocation

Commit Message

Cam Macdonell April 21, 2010, 5:53 p.m. UTC

None

Patch

diff --git a/cpu-common.h b/cpu-common.h
index 49c7fb3..d7c7d3a 100644
--- a/cpu-common.h
+++ b/cpu-common.h
@@ -9,6 +9,7 @@ 
 
 #include "bswap.h"
 #include "qemu-queue.h"
+#include <sys/types.h>
 
 #if !defined(CONFIG_USER_ONLY)
 
@@ -32,6 +33,7 @@  static inline void cpu_register_physical_memory(target_phys_addr_t start_addr,
 }
 
 ram_addr_t cpu_get_physical_page_desc(target_phys_addr_t addr);
+ram_addr_t qemu_ram_mmap(int fd, ram_addr_t addr, int flags, off_t offset);
 ram_addr_t qemu_ram_alloc(ram_addr_t);
 void qemu_ram_free(ram_addr_t addr);
 /* This should only be used for ram local to a device.  */
diff --git a/exec.c b/exec.c
index 467a0e7..702348e 100644
--- a/exec.c
+++ b/exec.c
@@ -2811,6 +2811,42 @@  static void *file_ram_alloc(ram_addr_t memory, const char *path)
 }
 #endif
 
+ram_addr_t qemu_ram_mmap(int fd, ram_addr_t size, int flags, off_t offset)
+{
+    RAMBlock *new_block;
+
+    size = TARGET_PAGE_ALIGN(size);
+    new_block = qemu_malloc(sizeof(*new_block));
+
+    /* map the file passed as a parameter to be this part of memory */
+    new_block->host = mmap(0, size, PROT_READ|PROT_WRITE, flags, fd, offset);
+
+    if (new_block->host == MAP_FAILED)
+        exit(1);
+
+#ifdef MADV_MERGEABLE
+    madvise(new_block->host, size, MADV_MERGEABLE);
+#endif
+
+    new_block->offset = last_ram_offset;
+    new_block->length = size;
+
+    new_block->next = ram_blocks;
+    ram_blocks = new_block;
+
+    phys_ram_dirty = qemu_realloc(phys_ram_dirty,
+        (last_ram_offset + size) >> TARGET_PAGE_BITS);
+    memset(phys_ram_dirty + (last_ram_offset >> TARGET_PAGE_BITS),
+           0xff, size >> TARGET_PAGE_BITS);
+
+    last_ram_offset += size;
+
+    if (kvm_enabled())
+        kvm_setup_guest_memory(new_block->host, size);
+
+    return new_block->offset;
+}
+
 ram_addr_t qemu_ram_alloc(ram_addr_t size)
 {
     RAMBlock *new_block;