[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 41/42] numa: allow memory-less nodes when using me
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL v3 41/42] numa: allow memory-less nodes when using memdev as backend |
Date: |
Tue, 2 Jul 2019 12:35:34 -0300 |
From: Igor Mammedov <address@hidden>
QEMU fails to start if memory-less node is present when memdev
is used
qemu-system-x86_64 -object memory-backend-ram,id=ram0,size=128M \
-numa node -numa node,memdev=ram0
with error:
"memdev option must be specified for either all or no nodes"
which works as expected if legacy 'mem' is used.
Fix check to make memory-less nodes valid when memdev option is used
but still disallow mix of mem and memdev options.
Signed-off-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
numa.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/numa.c b/numa.c
index 48fd43ecc6..1824c4e049 100644
--- a/numa.c
+++ b/numa.c
@@ -48,7 +48,8 @@ QemuOptsList qemu_numa_opts = {
.desc = { { 0 } } /* validated with OptsVisitor */
};
-static int have_memdevs = -1;
+static int have_memdevs;
+static int have_mem;
static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one.
* For all nodes, nodeid < max_numa_nodeid
*/
@@ -106,17 +107,11 @@ static void parse_numa_node(MachineState *ms,
NumaNodeOptions *node,
}
}
- if (node->has_mem && node->has_memdev) {
- error_setg(errp, "cannot specify both mem= and memdev=");
- return;
- }
-
- if (have_memdevs == -1) {
- have_memdevs = node->has_memdev;
- }
- if (node->has_memdev != have_memdevs) {
- error_setg(errp, "memdev option must be specified for either "
- "all or no nodes");
+ have_memdevs = have_memdevs ? : node->has_memdev;
+ have_mem = have_mem ? : node->has_mem;
+ if ((node->has_mem && have_memdevs) || (node->has_memdev && have_mem)) {
+ error_setg(errp, "numa configuration should use either mem= or
memdev=,"
+ "mixing both is not allowed");
return;
}
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL v3 34/42] i386: Get model-id from CPU object on "-cpu help", (continued)
- [Qemu-devel] [PULL v3 34/42] i386: Get model-id from CPU object on "-cpu help", Eduardo Habkost, 2019/07/02
- [Qemu-devel] [PULL v3 33/42] i386: Add x-force-features option for testing, Eduardo Habkost, 2019/07/02
- [Qemu-devel] [PULL v3 32/42] qmp: Add "alias-of" field to query-cpu-definitions, Eduardo Habkost, 2019/07/02
- [Qemu-devel] [PULL v3 39/42] docs: Deprecate CPU model runnability guarantees, Eduardo Habkost, 2019/07/02
- [Qemu-devel] [PULL v3 40/42] i386: Add Cascadelake-Server-v2 CPU model, Eduardo Habkost, 2019/07/02
- [Qemu-devel] [PULL v3 37/42] i386: Replace -noTSX, -IBRS, -IBPB CPU models with aliases, Eduardo Habkost, 2019/07/02
- [Qemu-devel] [PULL v3 36/42] i386: Define -IBRS, -noTSX, -IBRS versions of CPU models, Eduardo Habkost, 2019/07/02
- [Qemu-devel] [PULL v3 38/42] i386: Make unversioned CPU models be aliases, Eduardo Habkost, 2019/07/02
- [Qemu-devel] [PULL v3 41/42] numa: allow memory-less nodes when using memdev as backend,
Eduardo Habkost <=
- [Qemu-devel] [PULL v3 35/42] i386: Register versioned CPU models, Eduardo Habkost, 2019/07/02
- [Qemu-devel] [PULL v3 42/42] tests: use -numa memdev option in tests instead of legacy 'mem' option, Eduardo Habkost, 2019/07/02
- Re: [Qemu-devel] [PULL v3 00/42] Machine and x86 queue, 2019-07-02, no-reply, 2019/07/02
- Re: [Qemu-devel] [PULL v3 00/42] Machine and x86 queue, 2019-07-02, no-reply, 2019/07/02