From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WL8ia-0001hu-Kq for qemu-devel@nongnu.org; Wed, 05 Mar 2014 05:06:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WL8iT-00068h-8e for qemu-devel@nongnu.org; Wed, 05 Mar 2014 05:06:28 -0500 Received: from cantor2.suse.de ([195.135.220.15]:47241 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WL8iS-00068a-Vm for qemu-devel@nongnu.org; Wed, 05 Mar 2014 05:06:21 -0500 Message-ID: <5316F71A.4090004@suse.de> Date: Wed, 05 Mar 2014 11:06:18 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1393941656-29068-1-git-send-email-pbonzini@redhat.com> <1393941656-29068-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1393941656-29068-9-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 2.1 08/28] vl: convert -m to QemuOpts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org, imammedo@redhat.com Cc: hutao@cn.fujitsu.com, mtosatti@redhat.com, ehabkost@redhat.com, gaowanlong@cn.fujitsu.com, a.motakis@virtualopensystems.com Am 04.03.2014 15:00, schrieb Paolo Bonzini: > From: Igor Mammedov >=20 > Adds option to -m > "mem" - startup memory amount Sorry for jumping in late, but assuming that -m is for "memory" already, wouldn't it make more sense to name it "size" instead of "mem"? >=20 > For compatibility with legacy CLI if suffix-less number is passed, > it assumes amount in Mb. >=20 > Otherwise user is free to use suffixed number using suffixes b,k/K,M,G >=20 > Signed-off-by: Igor Mammedov > Reviewed-by: Eric Blake > Signed-off-by: Paolo Bonzini > --- > qemu-options.hx | 9 +++++--- > vl.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++---= -------- > 2 files changed, 63 insertions(+), 16 deletions(-) >=20 > diff --git a/qemu-options.hx b/qemu-options.hx > index f948f28..98e78ca 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -214,10 +214,13 @@ use is discouraged as it may be removed from futu= re versions. > ETEXI > =20 > DEF("m", HAS_ARG, QEMU_OPTION_m, > - "-m megs set virtual RAM size to megs MB [default=3D" > - stringify(DEFAULT_RAM_SIZE) "]\n", QEMU_ARCH_ALL) > + "-m [mem=3D]megs\n" > + " configure guest RAM\n" > + " mem: initial amount of guest memory (default: " > + stringify(DEFAULT_RAM_SIZE) "MiB)\n", > + QEMU_ARCH_ALL) > STEXI > -@item -m @var{megs} > +@item -m [mem=3D]@var{megs} > @findex -m > Set virtual RAM size to @var{megs} megabytes. Default is 128 MiB. Opt= ionally, > 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 dafe6f6..ac5f425 100644 > --- a/vl.c > +++ b/vl.c > @@ -478,6 +478,20 @@ static QemuOptsList qemu_msg_opts =3D { > }, > }; > =20 > +static QemuOptsList qemu_mem_opts =3D { > + .name =3D "memory", > + .implied_opt_name =3D "mem", > + .head =3D QTAILQ_HEAD_INITIALIZER(qemu_mem_opts.head), > + .merge_lists =3D true, > + .desc =3D { > + { > + .name =3D "mem", > + .type =3D QEMU_OPT_SIZE, > + }, > + { /* end of list */ } > + }, > +}; > + > /** > * Get machine options > * > @@ -2718,6 +2732,7 @@ int main(int argc, char **argv, char **envp) > }; > const char *trace_events =3D NULL; > const char *trace_file =3D NULL; > + const ram_addr_t default_ram_size =3D (ram_addr_t)DEFAULT_RAM_SIZE= * 1024 * 1024; > =20 > atexit(qemu_run_exit_notifiers); > error_set_progname(argv[0]); > @@ -2758,6 +2773,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); > =20 > runstate_init(); > =20 > @@ -2773,7 +2789,7 @@ int main(int argc, char **argv, char **envp) > module_call_init(MODULE_INIT_MACHINE); > machine =3D find_default_machine(); > cpu_model =3D NULL; > - ram_size =3D 0; > + ram_size =3D default_ram_size; > snapshot =3D 0; > cyls =3D heads =3D secs =3D 0; > translation =3D BIOS_ATA_TRANSLATION_AUTO; > @@ -3063,20 +3079,50 @@ 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; > =20 > - value =3D strtosz(optarg, &end); > - if (value < 0 || *end) { > - fprintf(stderr, "qemu: invalid ram size: %s\n", op= targ); > - exit(1); > + opts =3D qemu_opts_parse(qemu_find_opts("memory"), > + optarg, 1); > + if (!opts) { > + exit(EXIT_FAILURE); > + } > + > + mem_str =3D qemu_opt_get(opts, "mem"); > + if (!mem_str) { > + fprintf(stderr, "qemu: invalid -m option, missing = " > + "'mem' option\n"); error_report(), in particular to fix "qemu: " > + exit(EXIT_FAILURE); > + } > + if (!*mem_str) { > + fprintf(stderr, "qemu: missing 'mem' option value\= n"); error_report() > + exit(EXIT_FAILURE); > + } > + > + sz =3D 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 =3D sz; > + > + sz <<=3D 20; > + if ((sz >> 20) !=3D overflow_check) { > + fprintf(stderr, "qemu: too large 'mem' option = " > + "value\n"); error_report() > + exit(EXIT_FAILURE); > + } > + } > + > + /* backward compatibility behaviour for case "-m 0" */ > + if (sz =3D=3D 0) { > + sz =3D default_ram_size; > } > - sz =3D QEMU_ALIGN_UP((uint64_t)value, 8192); > + > + sz =3D QEMU_ALIGN_UP(sz, 8192); > ram_size =3D sz; > if (ram_size !=3D sz) { > fprintf(stderr, "qemu: ram size too large\n"); error_report() while at it? > - exit(1); > + exit(EXIT_FAILURE); > } > break; > } > @@ -3921,10 +3967,8 @@ int main(int argc, char **argv, char **envp) > exit(1); > } > =20 > - /* init the memory */ > - if (ram_size =3D=3D 0) { > - ram_size =3D DEFAULT_RAM_SIZE * 1024 * 1024; > - } > + /* store value for the future use */ > + qemu_opt_set_number(qemu_find_opts_singleton("memory"), "mem", ram= _size); > =20 > if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, = NULL, 0) > !=3D 0) { Here's a dependency on the preceding patch - other than that, these two could be applied independently of the rest via qemu-trivial? Regards, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg