[Qemu-devel] [PATCH 2/4] exec: add RAM_EXTERNAL flag to mark non-QEMU allocated blocks

[Yury Kotov]

This flag allows to determine whether RAM block is available from the outside.
E.g. when we use -object memory-backend-file or -mem-path options we have
a RAM block which is mapped to shared file.

We need this flag in the following commits.

Signed-off-by: Yury Kotov <address@hidden>
---
 backends/hostmem-file.c | 3 ++-
 exec.c                  | 2 +-
 include/exec/memory.h   | 3 +++
 numa.c                  | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index 7a34e25c43..37fe28f2ac 100644
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -63,7 +63,8 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error 
**errp)
                                      name,
                                      backend->size, fb->align,
                                      (backend->share ? RAM_SHARED : 0) |
-                                     (fb->is_pmem ? RAM_PMEM : 0),
+                                     (fb->is_pmem ? RAM_PMEM : 0) |
+                                     RAM_EXTERNAL,
                                      fb->mem_path, errp);
     g_free(name);
 #endif
diff --git a/exec.c b/exec.c
index 6e875f0640..ef2f29d7cb 100644
--- a/exec.c
+++ b/exec.c
@@ -2241,7 +2241,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, 
MemoryRegion *mr,
     int64_t file_size;
 
     /* Just support these ram flags by now. */
-    assert((ram_flags & ~(RAM_SHARED | RAM_PMEM)) == 0);
+    assert((ram_flags & ~(RAM_SHARED | RAM_PMEM | RAM_EXTERNAL)) == 0);
 
     if (xen_enabled()) {
         error_setg(errp, "-mem-path not supported with Xen");
diff --git a/include/exec/memory.h b/include/exec/memory.h
index ffd23ed8d8..3a9cb34f1e 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -126,6 +126,9 @@ typedef struct IOMMUNotifier IOMMUNotifier;
 /* RAM is a persistent kind memory */
 #define RAM_PMEM (1 << 5)
 
+/* RAM is from external source (e.g. from file) */
+#define RAM_EXTERNAL (1 << 6)
+
 static inline void iommu_notifier_init(IOMMUNotifier *n, IOMMUNotify fn,
                                        IOMMUNotifierFlag flags,
                                        hwaddr start, hwaddr end,
diff --git a/numa.c b/numa.c
index 50ec016013..653c5a08de 100644
--- a/numa.c
+++ b/numa.c
@@ -482,8 +482,8 @@ static void allocate_system_memory_nonnuma(MemoryRegion 
*mr, Object *owner,
     if (mem_path) {
 #ifdef __linux__
         Error *err = NULL;
-        memory_region_init_ram_from_file(mr, owner, name, ram_size, 0, 0,
-                                         mem_path, &err);
+        memory_region_init_ram_from_file(mr, owner, name, ram_size, 0,
+                                         RAM_EXTERNAL, mem_path, &err);
         if (err) {
             error_report_err(err);
             if (mem_prealloc) {
-- 
2.20.1