[v4,07/80] vl.c: ensure that ram_size matches size of machine.memory-backend

Commit Message

Igor Mammedov Jan. 31, 2020, 3:08 p.m. UTC

Extend set_memory_options() to check that size specified by -m
matches the size of backend pointed by memory-backend.
And in case of -m was omitted adjust ram_size to match that
of explicitly provided backend.

Signed-off-by: Igor Mammedov <[e-mail]>
---
CC: [e-mail]
CC: [e-mail]
---
 vl.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

Patch

diff --git a/vl.c b/vl.c
index 1c0314d..4ce0799 100644
--- a/vl.c
+++ b/vl.c
@@ -2689,6 +2689,21 @@  static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size,
         exit(EXIT_FAILURE);
     }
 
+    if (current_machine->ram_memdev_id) {
+        Object *backend;
+        ram_addr_t backend_size;
+
+        backend = object_resolve_path_type(current_machine->ram_memdev_id,
+                                           TYPE_MEMORY_BACKEND, NULL);
+        backend_size = object_property_get_uint(backend, "size",  &error_abort);
+        if (mem_str && backend_size != ram_size) {
+                error_report("Size specified by -m option must match size of "
+                             "explicitly specified 'memory-backend' property");
+                exit(EXIT_FAILURE);
+        }
+        ram_size = backend_size;
+    }
+
     if (!xen_enabled()) {
         /* On 32-bit hosts, QEMU is limited by virtual address space */
         if (ram_size > (2047 << 20) && HOST_LONG_BITS == 32) {