aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2020-06-09 09:56:35 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-06-26 09:39:39 -0400
commit32a354dc6c07d766e70b51f42a62d8cd479e3f82 (patch)
treeb038d7e9748bdfd15868fb760e52295b006dfc2b /qemu-options.hx
parentf9919116b8c226428df28bc69ab33480eaa1ee6d (diff)
downloadqemu-32a354dc6c07d766e70b51f42a62d8cd479e3f82.zip
qemu-32a354dc6c07d766e70b51f42a62d8cd479e3f82.tar.gz
qemu-32a354dc6c07d766e70b51f42a62d8cd479e3f82.tar.bz2
numa: forbid '-numa node, mem' for 5.1 and newer machine types
Deprecation period is run out and it's a time to flip the switch introduced by cd5ff8333a. Disable legacy option for new machine types (since 5.1) and amend documentation. '-numa node,memdev' shall be used instead of disabled option with new machine types. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Greg Kurz <groug@kaod.org> Message-Id: <20200609135635.761587-1-imammedo@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx9
1 files changed, 5 insertions, 4 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index 93bde2b..196f468 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -239,10 +239,11 @@ SRST
-numa node,nodeid=0 -numa node,nodeid=1 \
-numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1
- '\ ``mem``\ ' assigns a given RAM amount to a node. '\ ``memdev``\ '
- assigns RAM from a given memory backend device to a node. If
- '\ ``mem``\ ' and '\ ``memdev``\ ' are omitted in all nodes, RAM is
- split equally between them.
+ Legacy '\ ``mem``\ ' assigns a given RAM amount to a node (not supported
+ for 5.1 and newer machine types). '\ ``memdev``\ ' assigns RAM from
+ a given memory backend device to a node. If '\ ``mem``\ ' and
+ '\ ``memdev``\ ' are omitted in all nodes, RAM is split equally between them.
+
'\ ``mem``\ ' and '\ ``memdev``\ ' are mutually exclusive.
Furthermore, if one node uses '\ ``memdev``\ ', all of them have to