Message ID | 1394035840-1584-3-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
Am 05.03.2014 17:10, schrieb Igor Mammedov: > Adds option to -m > "size" - 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 <imammedo@redhat.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > v2: > - suggested by Andreas Färber <afaerber@suse.de> > * s/fprintf/error_report/ > * rename 'mem' option to 'size' > - fix conflict with missing numa QemuOpts > --- > qemu-options.hx | 9 ++++-- > vl.c | 71 ++++++++++++++++++++++++++++++++++++++++++++----------- > 2 files changed, 63 insertions(+), 17 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 56e5fdf..5e89e0d 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -210,10 +210,13 @@ 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 [size=]megs\n" > + " configure guest RAM\n" > + " size: initial amount of guest memory (default: " > + stringify(DEFAULT_RAM_SIZE) "MiB)\n", > + QEMU_ARCH_ALL) > STEXI > -@item -m @var{megs} > +@item -m [size=]@var{megs} > @findex -m > Set virtual RAM size to @var{megs} megabytes. Default is 128 MiB. Optionally, > a suffix of ``M'' or ``G'' can be used to signify a value in megabytes or > diff --git a/vl.c b/vl.c > index 7eb3b73..72235c5 100644 > --- a/vl.c > +++ b/vl.c > @@ -475,6 +475,20 @@ static QemuOptsList qemu_msg_opts = { > }, > }; > > +static QemuOptsList qemu_mem_opts = { > + .name = "memory", > + .implied_opt_name = "mem", "size" > + .head = QTAILQ_HEAD_INITIALIZER(qemu_mem_opts.head), > + .merge_lists = true, > + .desc = { > + { > + .name = "mem", "size" > + .type = QEMU_OPT_SIZE, > + }, > + { /* end of list */ } > + }, > +}; > + > /** > * Get machine options > * > @@ -2835,6 +2849,8 @@ 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 = (ram_addr_t)DEFAULT_RAM_SIZE * > + 1024 * 1024; > > atexit(qemu_run_exit_notifiers); > error_set_progname(argv[0]); > @@ -2866,6 +2882,7 @@ int main(int argc, char **argv, char **envp) > qemu_add_opts(&qemu_trace_opts); > qemu_add_opts(&qemu_option_rom_opts); > qemu_add_opts(&qemu_machine_opts); > + qemu_add_opts(&qemu_mem_opts); > qemu_add_opts(&qemu_smp_opts); > qemu_add_opts(&qemu_boot_opts); > qemu_add_opts(&qemu_sandbox_opts); > @@ -2889,7 +2906,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; > @@ -3176,20 +3193,48 @@ 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); > - exit(1); > + opts = qemu_opts_parse(qemu_find_opts("memory"), > + optarg, 1); > + if (!opts) { > + exit(EXIT_FAILURE); > + } > + > + mem_str = qemu_opt_get(opts, "mem"); "size" > + if (!mem_str) { > + error_report("invalid -m option, missing 'size' option"); > + exit(EXIT_FAILURE); > + } > + if (!*mem_str) { > + error_report("missing 'size' option value"); > + exit(EXIT_FAILURE); > + } > + > + sz = qemu_opt_get_size(opts, "mem", ram_size); "size" > + > + /* Fix up legacy suffix-less format */ > + if (g_ascii_isdigit(mem_str[strlen(mem_str) - 1])) { > + uint64_t overflow_check = sz; > + > + sz <<= 20; > + if ((sz >> 20) != overflow_check) { > + error_report("too large 'size' option value"); > + exit(EXIT_FAILURE); > + } > + } > + > + /* backward compatibility behaviour for case "-m 0" */ > + if (sz == 0) { > + sz = default_ram_size; > } > - sz = QEMU_ALIGN_UP((uint64_t)value, 8192); > + > + sz = QEMU_ALIGN_UP(sz, 8192); > ram_size = sz; > if (ram_size != sz) { > - fprintf(stderr, "qemu: ram size too large\n"); > - exit(1); > + error_report("ram size too large"); > + exit(EXIT_FAILURE); > } > break; > } > @@ -4034,10 +4079,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"), "mem", ram_size); "size" > > if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, 0) > != 0) { Regards, Andreas
On 03/05/2014 09:10 AM, Igor Mammedov wrote: > Adds option to -m > "size" - 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 <imammedo@redhat.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > v2: > - suggested by Andreas Färber <afaerber@suse.de> > * s/fprintf/error_report/ > * rename 'mem' option to 'size' > - fix conflict with missing numa QemuOpts Given the amount of rework in v2, it may have been smarter to drop my R-b tag. But beyond Andreas' findings of missing s/mem/size/ instances, I'm not spotting any problems, so if that's the only fix you make for v4, you can keep my R-b.
On Wed, 05 Mar 2014 18:04:23 +0100 Andreas Färber <afaerber@suse.de> wrote: > Am 05.03.2014 17:10, schrieb Igor Mammedov: > > Adds option to -m > > "size" - 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 <imammedo@redhat.com> > > Reviewed-by: Eric Blake <eblake@redhat.com> > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > > --- > > v2: > > - suggested by Andreas Färber <afaerber@suse.de> > > * s/fprintf/error_report/ > > * rename 'mem' option to 'size' > > - fix conflict with missing numa QemuOpts > > --- > > qemu-options.hx | 9 ++++-- > > vl.c | 71 ++++++++++++++++++++++++++++++++++++++++++++----------- > > 2 files changed, 63 insertions(+), 17 deletions(-) > > > > diff --git a/qemu-options.hx b/qemu-options.hx > > index 56e5fdf..5e89e0d 100644 > > --- a/qemu-options.hx > > +++ b/qemu-options.hx > > @@ -210,10 +210,13 @@ 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 [size=]megs\n" > > + " configure guest RAM\n" > > + " size: initial amount of guest memory (default: " > > + stringify(DEFAULT_RAM_SIZE) "MiB)\n", > > + QEMU_ARCH_ALL) > > STEXI > > -@item -m @var{megs} > > +@item -m [size=]@var{megs} > > @findex -m > > Set virtual RAM size to @var{megs} megabytes. Default is 128 MiB. Optionally, > > a suffix of ``M'' or ``G'' can be used to signify a value in megabytes or > > diff --git a/vl.c b/vl.c > > index 7eb3b73..72235c5 100644 > > --- a/vl.c > > +++ b/vl.c > > @@ -475,6 +475,20 @@ static QemuOptsList qemu_msg_opts = { > > }, > > }; > > > > +static QemuOptsList qemu_mem_opts = { > > + .name = "memory", > > + .implied_opt_name = "mem", > > "size" > > > + .head = QTAILQ_HEAD_INITIALIZER(qemu_mem_opts.head), > > + .merge_lists = true, > > + .desc = { > > + { > > + .name = "mem", > > "size" > > > + .type = QEMU_OPT_SIZE, > > + }, > > + { /* end of list */ } > > + }, > > +}; > > + > > /** > > * Get machine options > > * > > @@ -2835,6 +2849,8 @@ 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 = (ram_addr_t)DEFAULT_RAM_SIZE * > > + 1024 * 1024; > > > > atexit(qemu_run_exit_notifiers); > > error_set_progname(argv[0]); > > @@ -2866,6 +2882,7 @@ int main(int argc, char **argv, char **envp) > > qemu_add_opts(&qemu_trace_opts); > > qemu_add_opts(&qemu_option_rom_opts); > > qemu_add_opts(&qemu_machine_opts); > > + qemu_add_opts(&qemu_mem_opts); > > qemu_add_opts(&qemu_smp_opts); > > qemu_add_opts(&qemu_boot_opts); > > qemu_add_opts(&qemu_sandbox_opts); > > @@ -2889,7 +2906,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; > > @@ -3176,20 +3193,48 @@ 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); > > - exit(1); > > + opts = qemu_opts_parse(qemu_find_opts("memory"), > > + optarg, 1); > > + if (!opts) { > > + exit(EXIT_FAILURE); > > + } > > + > > + mem_str = qemu_opt_get(opts, "mem"); > > "size" > > > + if (!mem_str) { > > + error_report("invalid -m option, missing 'size' option"); > > + exit(EXIT_FAILURE); > > + } > > + if (!*mem_str) { > > + error_report("missing 'size' option value"); > > + exit(EXIT_FAILURE); > > + } > > + > > + sz = qemu_opt_get_size(opts, "mem", ram_size); > > "size" > > > + > > + /* Fix up legacy suffix-less format */ > > + if (g_ascii_isdigit(mem_str[strlen(mem_str) - 1])) { > > + uint64_t overflow_check = sz; > > + > > + sz <<= 20; > > + if ((sz >> 20) != overflow_check) { > > + error_report("too large 'size' option value"); > > + exit(EXIT_FAILURE); > > + } > > + } > > + > > + /* backward compatibility behaviour for case "-m 0" */ > > + if (sz == 0) { > > + sz = default_ram_size; > > } > > - sz = QEMU_ALIGN_UP((uint64_t)value, 8192); > > + > > + sz = QEMU_ALIGN_UP(sz, 8192); > > ram_size = sz; > > if (ram_size != sz) { > > - fprintf(stderr, "qemu: ram size too large\n"); > > - exit(1); > > + error_report("ram size too large"); > > + exit(EXIT_FAILURE); > > } > > break; > > } > > @@ -4034,10 +4079,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"), "mem", ram_size); > > "size" > > > > > if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, 0) > > != 0) { Thanks for review and I'm sorry for silly mistakes, I'll fix and resubmit it as v4 (tested this time). > Regards, > Andreas >
On Wed, 05 Mar 2014 13:33:43 -0700 Eric Blake <eblake@redhat.com> wrote: > On 03/05/2014 09:10 AM, Igor Mammedov wrote: > > Adds option to -m > > "size" - 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 <imammedo@redhat.com> > > Reviewed-by: Eric Blake <eblake@redhat.com> > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > > --- > > v2: > > - suggested by Andreas Färber <afaerber@suse.de> > > * s/fprintf/error_report/ > > * rename 'mem' option to 'size' > > - fix conflict with missing numa QemuOpts > > Given the amount of rework in v2, it may have been smarter to drop my > R-b tag. But beyond Andreas' findings of missing s/mem/size/ instances, > I'm not spotting any problems, so if that's the only fix you make for > v4, you can keep my R-b. > Thanks!
diff --git a/qemu-options.hx b/qemu-options.hx index 56e5fdf..5e89e0d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -210,10 +210,13 @@ 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 [size=]megs\n" + " configure guest RAM\n" + " size: initial amount of guest memory (default: " + stringify(DEFAULT_RAM_SIZE) "MiB)\n", + QEMU_ARCH_ALL) STEXI -@item -m @var{megs} +@item -m [size=]@var{megs} @findex -m Set virtual RAM size to @var{megs} megabytes. Default is 128 MiB. Optionally, a suffix of ``M'' or ``G'' can be used to signify a value in megabytes or diff --git a/vl.c b/vl.c index 7eb3b73..72235c5 100644 --- a/vl.c +++ b/vl.c @@ -475,6 +475,20 @@ static QemuOptsList qemu_msg_opts = { }, }; +static QemuOptsList qemu_mem_opts = { + .name = "memory", + .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 * @@ -2835,6 +2849,8 @@ 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 = (ram_addr_t)DEFAULT_RAM_SIZE * + 1024 * 1024; atexit(qemu_run_exit_notifiers); error_set_progname(argv[0]); @@ -2866,6 +2882,7 @@ int main(int argc, char **argv, char **envp) qemu_add_opts(&qemu_trace_opts); qemu_add_opts(&qemu_option_rom_opts); qemu_add_opts(&qemu_machine_opts); + qemu_add_opts(&qemu_mem_opts); qemu_add_opts(&qemu_smp_opts); qemu_add_opts(&qemu_boot_opts); qemu_add_opts(&qemu_sandbox_opts); @@ -2889,7 +2906,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; @@ -3176,20 +3193,48 @@ 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); - exit(1); + opts = qemu_opts_parse(qemu_find_opts("memory"), + optarg, 1); + if (!opts) { + exit(EXIT_FAILURE); + } + + mem_str = qemu_opt_get(opts, "mem"); + if (!mem_str) { + error_report("invalid -m option, missing 'size' option"); + exit(EXIT_FAILURE); + } + if (!*mem_str) { + error_report("missing 'size' option value"); + exit(EXIT_FAILURE); + } + + 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])) { + uint64_t overflow_check = sz; + + sz <<= 20; + if ((sz >> 20) != overflow_check) { + error_report("too large 'size' option value"); + exit(EXIT_FAILURE); + } + } + + /* backward compatibility behaviour for case "-m 0" */ + if (sz == 0) { + sz = default_ram_size; } - sz = QEMU_ALIGN_UP((uint64_t)value, 8192); + + sz = QEMU_ALIGN_UP(sz, 8192); ram_size = sz; if (ram_size != sz) { - fprintf(stderr, "qemu: ram size too large\n"); - exit(1); + error_report("ram size too large"); + exit(EXIT_FAILURE); } break; } @@ -4034,10 +4079,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"), "mem", ram_size); if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, 0) != 0) {