[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 07/79] vl.c: ensure that ram_size matches size of machine.memo
From: |
Igor Mammedov |
Subject: |
[PATCH v5 07/79] vl.c: ensure that ram_size matches size of machine.memory-backend |
Date: |
Mon, 17 Feb 2020 12:33:40 -0500 |
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 <address@hidden>
---
CC: address@hidden
CC: address@hidden
---
vl.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/vl.c b/vl.c
index 72ffc06f2f..a7edcba094 100644
--- a/vl.c
+++ b/vl.c
@@ -2655,6 +2655,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) {
--
2.18.1
- Re: [PATCH v5 01/79] numa: remove deprecated -mem-path fallback to anonymous RAM, (continued)
- [PATCH v5 02/79] machine: introduce memory-backend property, Igor Mammedov, 2020/02/17
- [PATCH v5 03/79] machine: alias -mem-path and -mem-prealloc into memory-foo backend, Igor Mammedov, 2020/02/17
- [PATCH v5 04/79] machine: introduce convenience MachineState::ram, Igor Mammedov, 2020/02/17
- [PATCH v5 05/79] initialize MachineState::ram in NUMA case, Igor Mammedov, 2020/02/17
- [PATCH v5 06/79] vl.c: move -m parsing after memory backends has been processed, Igor Mammedov, 2020/02/17
- [PATCH v5 08/79] alpha/dp264: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 07/79] vl.c: ensure that ram_size matches size of machine.memory-backend,
Igor Mammedov <=
- [PATCH v5 11/79] arm/collie: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 10/79] arm/aspeed: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 12/79] arm/cubieboard: use memdev for RAM, Igor Mammedov, 2020/02/17