aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorMatthew Rosato <mjrosato@linux.vnet.ibm.com>2014-08-28 11:25:33 -0400
committerChristian Borntraeger <borntraeger@de.ibm.com>2014-09-01 09:25:32 +0200
commitb6fe01248e66a3c1b1b22a9cd640bfa86d4c358c (patch)
treebc865027266a6747c0d521e11485145265749155 /qemu-options.hx
parent0844df77fdf9cd115a3b8f414333d41b3a88bc9d (diff)
downloadqemu-b6fe01248e66a3c1b1b22a9cd640bfa86d4c358c.zip
qemu-b6fe01248e66a3c1b1b22a9cd640bfa86d4c358c.tar.gz
qemu-b6fe01248e66a3c1b1b22a9cd640bfa86d4c358c.tar.bz2
virtio-ccw: Include standby memory when calculating storage increment
When determining the memory increment size, use the maxmem size if it was specified. Signed-off-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx3
1 files changed, 2 insertions, 1 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index c573dd8..9828952 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -225,7 +225,8 @@ DEF("m", HAS_ARG, QEMU_OPTION_m,
" size: initial amount of guest memory (default: "
stringify(DEFAULT_RAM_SIZE) "MiB)\n"
" slots: number of hotplug slots (default: none)\n"
- " maxmem: maximum amount of guest memory (default: none)\n",
+ " maxmem: maximum amount of guest memory (default: none)\n"
+ "NOTE: Some architectures might enforce a specific granularity\n",
QEMU_ARCH_ALL)
STEXI
@item -m [size=]@var{megs}