commit e1c57ab86f3c4ea6532b51cfecf32770b45f5e7a
author Paolo Bonzini <pbonzini@redhat.com> Wed May 14 17:43:18 2014 +0800
committer Michael S. Tsirkin <mst@redhat.com> Thu Jun 19 18:44:19 2014 +0300
tree efabd38dd43f634554d6349998f94f0f92c61289
parent dfabb8b91655f680eaa1aa05e9f226fbd596a70f

memory: reorganize file-based allocation

Split the internal interface in exec.c to a separate function, and
push the check on mem_path up to memory_region_init_ram.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

memory.c

diff --git a/memory.c b/memory.c
index 3e8cd56..063effe 100644
--- a/memory.c
+++ b/memory.c
@@ -23,6 +23,7 @@
 
 #include "exec/memory-internal.h"
 #include "exec/ram_addr.h"
+#include "sysemu/sysemu.h"
 
 //#define DEBUG_UNASSIGNED
 
@@ -1029,7 +1030,11 @@
     mr->ram = true;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
-    mr->ram_addr = qemu_ram_alloc(size, mr);
+    if (mem_path) {
+        mr->ram_addr = qemu_ram_alloc_from_file(size, mr, mem_path);
+    } else {
+        mr->ram_addr = qemu_ram_alloc(size, mr);
+    }
 }
 
 void memory_region_init_ram_ptr(MemoryRegion *mr,