[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 08/14] vl: convert -m to QemuOpts
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [RFC PATCH 08/14] vl: convert -m to QemuOpts |
Date: |
Wed, 11 Dec 2013 13:19:15 +0100 |
From: Igor Mammedov <address@hidden>
Adds option to -m
"mem" - startup memory amount
For compatibility with legacy CLI if suffix-less number is passed,
it assumes amount in Mb.
Otherwise user is free to use suffixed number using suffixes b,k/K,M,G
Signed-off-by: Igor Mammedov <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-options.hx | 7 +++++--
vl.c | 52 +++++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index af34483..416f8e4 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -210,8 +210,11 @@ use is discouraged as it may be removed from future
versions.
ETEXI
DEF("m", HAS_ARG, QEMU_OPTION_m,
- "-m megs set virtual RAM size to megs MB [default="
- stringify(DEFAULT_RAM_SIZE) "]\n", QEMU_ARCH_ALL)
+ "-m [mem=]megs\n"
+ " configure guest RAM\n"
+ " mem: initial amount of guest memory (default: "
+ stringify(DEFAULT_RAM_SIZE) "Mb)\n",
+ QEMU_ARCH_ALL)
STEXI
@item -m @var{megs}
@findex -m
diff --git a/vl.c b/vl.c
index ecda5ad..68ba565 100644
--- a/vl.c
+++ b/vl.c
@@ -530,6 +530,20 @@ static QemuOptsList qemu_msg_opts = {
},
};
+static QemuOptsList qemu_mem_opts = {
+ .name = "memory-opts",
+ .implied_opt_name = "mem",
+ .head = QTAILQ_HEAD_INITIALIZER(qemu_mem_opts.head),
+ .merge_lists = true,
+ .desc = {
+ {
+ .name = "mem",
+ .type = QEMU_OPT_SIZE,
+ },
+ { /* end of list */ }
+ },
+};
+
/**
* Get machine options
*
@@ -2746,6 +2760,7 @@ int main(int argc, char **argv, char **envp)
};
const char *trace_events = NULL;
const char *trace_file = NULL;
+ const ram_addr_t default_ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
atexit(qemu_run_exit_notifiers);
error_set_progname(argv[0]);
@@ -2785,6 +2800,7 @@ int main(int argc, char **argv, char **envp)
qemu_add_opts(&qemu_realtime_opts);
qemu_add_opts(&qemu_msg_opts);
qemu_add_opts(&qemu_numa_opts);
+ qemu_add_opts(&qemu_mem_opts);
runstate_init();
@@ -2800,7 +2816,7 @@ int main(int argc, char **argv, char **envp)
module_call_init(MODULE_INIT_MACHINE);
machine = find_default_machine();
cpu_model = NULL;
- ram_size = 0;
+ ram_size = default_ram_size;
snapshot = 0;
cyls = heads = secs = 0;
translation = BIOS_ATA_TRANSLATION_AUTO;
@@ -3080,16 +3096,32 @@ int main(int argc, char **argv, char **envp)
exit(0);
break;
case QEMU_OPTION_m: {
- int64_t value;
uint64_t sz;
- char *end;
+ const char *mem_str;
- value = strtosz(optarg, &end);
- if (value < 0 || *end) {
- fprintf(stderr, "qemu: invalid ram size: %s\n", optarg);
+ opts = qemu_opts_parse(qemu_find_opts("memory-opts"),
+ optarg, 1);
+
+ mem_str = qemu_opt_get(opts, "mem");
+ if (!mem_str) {
+ fprintf(stderr, "qemu: invalid -m option, missing "
+ " 'mem' option\n");
exit(1);
}
- sz = QEMU_ALIGN_UP((uint64_t)value, 8192);
+
+ sz = qemu_opt_get_size(opts, "mem", ram_size);
+
+ /* Fix up legacy suffix-less format */
+ if (g_ascii_isdigit(mem_str[strlen(mem_str) - 1])) {
+ sz <<= 20;
+ }
+
+ /* backward compatibility behaviour for case "-m 0" */
+ if (sz == 0) {
+ sz = default_ram_size;
+ }
+
+ sz = QEMU_ALIGN_UP(sz, 8192);
ram_size = sz;
if (ram_size != sz) {
fprintf(stderr, "qemu: ram size too large\n");
@@ -3929,10 +3961,8 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
- /* init the memory */
- if (ram_size == 0) {
- ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
- }
+ /* store value for the future use */
+ qemu_opt_set_number(qemu_find_opts_singleton("memory-opts"), "mem",
ram_size);
if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, 0)
!= 0) {
--
1.8.4.2
- [Qemu-devel] [RFC PATCH 01/14] NUMA: move numa related code to new file numa.c, (continued)
- [Qemu-devel] [RFC PATCH 01/14] NUMA: move numa related code to new file numa.c, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 02/14] NUMA: check if the total numa memory size is equal to ram_size, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 03/14] NUMA: Add numa_info structure to contain numa nodes info, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 04/14] NUMA: convert -numa option to use OptsVisitor, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 05/14] NUMA: expand MAX_NODES from 64 to 128, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 06/14] qapi: add SIZE type parser to string_input_visitor, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 07/14] QemuOpts: introduce qemu_find_opts_singleton, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 08/14] vl: convert -m to QemuOpts,
Paolo Bonzini <=
- [Qemu-devel] [RFC PATCH 09/14] qom: fix leak for objects created with -object, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 10/14] qom: catch errors in object_property_add_child, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 11/14] pc: pass QEMUMachineInitArgs to pc_memory_init, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 12/14] numa: introduce memory_region_allocate_system_memory, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 13/14] add memdev backend infrastructure, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 14/14] numa: add -numa node, memdev= option, Paolo Bonzini, 2013/12/11