summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2015-06-05 11:05:03 +0200
committerPeter Maydell <peter.maydell@linaro.org>2015-06-08 13:31:34 +0100
commit0daba1f037ab85be7a9ff7ee37ba6b644c5e7977 (patch)
treeebf1e82ea3d353f725d18fe6e1819f242dbf72e1
parent779cec4d20907cbccb26fbf5f5c19c6cdee33eff (diff)
downloadfocaccia-qemu-0daba1f037ab85be7a9ff7ee37ba6b644c5e7977.tar.gz
focaccia-qemu-0daba1f037ab85be7a9ff7ee37ba6b644c5e7977.zip
machine: Drop use of DEFAULT_RAM_SIZE in help text
As of commit 076b35b5a (machine: add default_ram_size to machine
class) we no longer have a global default ram size, but instead
machine specific defaults.  When invoking qemu --help we don't know
which machine you selected, so we can't tell the user the default RAM
size in the help text anymore now.

Thus I don't see an easy way to expose the default ram size to the
user in the help text.  The easiest option IMHO is to just drop this
piece of information.

Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Acked-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Acked-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Message-id: 1433495103-62084-1-git-send-email-agraf@suse.de
[PMM: rewrapped long commit message lines]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--qemu-options.hx3
1 files changed, 1 insertions, 2 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index b3db6cbe86..5eaba11cbc 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -241,8 +241,7 @@ ETEXI
 DEF("m", HAS_ARG, QEMU_OPTION_m,
     "-m[emory] [size=]megs[,slots=n,maxmem=size]\n"
     "                configure guest RAM\n"
-    "                size: initial amount of guest memory (default: "
-    stringify(DEFAULT_RAM_SIZE) "MiB)\n"
+    "                size: initial amount of guest memory\n"
     "                slots: number of hotplug slots (default: none)\n"
     "                maxmem: maximum amount of guest memory (default: none)\n"
     "NOTE: Some architectures might enforce a specific granularity\n",