convert -m to QemuOpts
v3 cover convert -m to QemuOpts
changes since v2 suggested by Andreas Färber:
- s/fprintf/error_report/
- rename 'mem' option to 'size'
- CCing to qemu-trivial
changes since v1:
- check for overflow
- check for empty mem="" case
- reshuffle code to avoid conflicts with another series on list
- some style/typo fixes
changes since RFC:
- resolved conflict with error_abort change
in qemu_get_machine_opts()
Igor Mammedov (1):
vl: convert -m to QemuOpts
Paolo Bonzini (1):
qemu-option: introduce qemu_find_opts_singleton
include/qemu/config-file.h | 2 + qemu-options.hx | 9 +++-- util/qemu-config.c | 14 +++++++ vl.c | 82 +++++++++++++++++++++++++++++++------------- 4 files changed, 80 insertions(+), 27 deletions(-)
PATCH v3 1/2 qemu-option: introduce qemu_find_opts_singleton
From: Paolo Bonzini <[email protected]>
--- include/qemu/config-file.h | 2 ++ util/qemu-config.c | 14 ++++++++++++++ vl.c | 11 +---------- 3 files changed, 17 insertions(+), 10 deletions(-)
include/qemu/config-file.h +2 -0
@@ -8,6 +8,8 @@QemuOptsList *qemu_find_opts (const char *group);QemuOptsList *qemu_find_opts_err (const char *group,Error **errp); +QemuOpts *qemu_find_opts_singleton (const char *group); +void qemu_add_opts (QemuOptsList *list);void qemu_add_drive_opts (QemuOptsList *list);int qemu_set_option (const char *str);
util/qemu-config.c +14 -0
@@ -39,6 +39,20 @@ QemuOptsList *qemu_find_opts(const char *group)return ret; } +QemuOpts *qemu_find_opts_singleton (const char *group) +{ +QemuOptsList *list; +QemuOpts *opts; + + list =qemu_find_opts (group); +assert (list); + opts =qemu_opts_find (list,NULL ); +if (!opts) { + opts =qemu_opts_create (list,NULL ,0 , &error_abort); + } +return opts; +} +static CommandLineParameterInfoList *query_option_descs (const QemuOptDesc *desc) {CommandLineParameterInfoList *param_list =NULL , *entry;
vl.c +1 -10
@@ -482,16 +482,7 @@ static QemuOptsList qemu_msg_opts = {*/ QemuOpts *qemu_get_machine_opts (void ) { -QemuOptsList *list; -QemuOpts *opts; - - list =qemu_find_opts ("machine" ); -assert (list); - opts =qemu_opts_find (list,NULL ); -if (!opts) { - opts =qemu_opts_create (list,NULL ,0 , &error_abort); - } -return opts; +return qemu_find_opts_singleton ("machine" ); }const char *qemu_get_vm_name (void )
Signature · 1 line
1.7.1
PATCH v3 2/2 vl: convert -m to QemuOpts
In reply to Igor MammedovAdds 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
---
v2:
- suggested by Andreas Färber <[email protected]>
* 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(-)
qemu-options.hx +6 -3
@@ -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
vl.c +57 -14
112 lines not on this page · raw message
Signature · 1 line
1.7.1
Re: [Qemu-devel] [PATCH v3 2/2] vl: convert -m to QemuOpts
Am 05.03.2014 17:10, schrieb Igor Mammedov:
Quoted 48 lines
Adds option to -m
"size" - startup memory amountFor 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 <[email protected]>Reviewed-by Eric Blake <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>---
v2:
- suggested by Andreas Färber <[email protected]>
* 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(-)qemu-options.hx +6
-3@@ -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 orvl.c +0
-0
vl.c static QemuOptsList qemu_msg_opts = { · line 480
Quoted 6 lines
vl.c +3
-0@@ -475,6 +475,20 @@ static QemuOptsList qemu_msg_opts = { }, }; +static QemuOptsList qemu_mem_opts = { + .name ="memory" , + .implied_opt_name ="mem" ,
"size"
vl.c static QemuOptsList qemu_msg_opts = { · line 485
Quoted 5 lines
vl.c +5
-0+ .head = QTAILQ_HEAD_INITIALIZER(qemu_mem_opts.head), + .merge_lists = true, + .desc = { + { + .name = "mem",
"size"
Quoted 45 lines
vl.c +11
-4+ .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);
vl.c int main(int argc, char **argv, char **envp) · line 3205
Quoted 10 lines
vl.c +7
-3-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"
vl.c int main(int argc, char **argv, char **envp) · line 3215
Quoted 10 lines
vl.c +10
-0+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"
Quoted 29 lines
vl.c +19
-3+ +/* 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 ; }
vl.c int main(int argc, char **argv, char **envp) · line 4083
Quoted 9 lines
vl.c +2
-4@@ -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"
vl.c int main(int argc, char **argv, char **envp) · line 4086
Quoted 3 lines
vl.c +0
-0if (qemu_opts_foreach (qemu_find_opts ("device" ), device_help_func,NULL ,0 ) !=0 ) {
Regards,
Andreas
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Re: [Qemu-devel] [PATCH v3 2/2] vl: convert -m to QemuOpts
Quoted 169 lines · On Wed, 05 Mar 2014 18:04:23 +0100 Andreas Färber <[email protected]> wrote:
Am 05.03.2014 17:10, schrieb Igor Mammedov:
Quoted 48 lines
Adds option to -m
"size" - startup memory amountFor 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 <[email protected]>Reviewed-by Eric Blake <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>---
v2:
- suggested by Andreas Färber <[email protected]>
* 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(-)qemu-options.hx +6
-3@@ -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 orvl.c +0
-0vl.c static QemuOptsList qemu_msg_opts = { · line 480
Quoted 6 lines
vl.c +3
-0@@ -475,6 +475,20 @@ static QemuOptsList qemu_msg_opts = { }, }; +static QemuOptsList qemu_mem_opts = { + .name ="memory" , + .implied_opt_name ="mem" ,"size"
vl.c static QemuOptsList qemu_msg_opts = { · line 485
Quoted 5 lines
vl.c +5
-0+ .head = QTAILQ_HEAD_INITIALIZER(qemu_mem_opts.head), + .merge_lists = true, + .desc = { + { + .name = "mem","size"
Quoted 45 lines
vl.c +11
-4+ .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);vl.c int main(int argc, char **argv, char **envp) · line 3205
Quoted 10 lines
vl.c +7
-3-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"
vl.c int main(int argc, char **argv, char **envp) · line 3215
Quoted 10 lines
vl.c +10
-0+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"
Quoted 32 lines
vl.c +19
-3+ +/* 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 ); }
Quoted 12 lines
vl.c int main(int argc, char **argv, char **envp) · line 4083
Quoted 6 lines
vl.c +2
-4-/* 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"
Quoted 3 lines
vl.c +0
-0if (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).
Quoted 3 lines
Regards,
Andreas
Re: [Qemu-devel] [PATCH v3 2/2] vl: convert -m to QemuOpts
In reply to Igor MammedovQuoted 11 lines · Igor Mammedov
Adds option to -m
"size" - startup memory amountFor 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 <[email protected]>Reviewed-by Eric Blake <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>
Quoted 6 lines
---
v2:
- suggested by Andreas Färber <[email protected]>
* 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.
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Re: [Qemu-devel] [PATCH v3 2/2] vl: convert -m to QemuOpts
Quoted 19 lines · On Wed, 05 Mar 2014 13:33:43 -0700 Eric Blake <[email protected]> wrote:
Quoted 11 lines · Igor Mammedov
Adds option to -m
"size" - startup memory amountFor 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 <[email protected]>Reviewed-by Eric Blake <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>Quoted 6 lines
---
v2:
- suggested by Andreas Färber <[email protected]>
* s/fprintf/error_report/
* rename 'mem' option to 'size'
- fix conflict with missing numa QemuOpts
Quoted 5 lines
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!