From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpOC6-0005Oi-7X for qemu-devel@nongnu.org; Wed, 19 Jun 2013 15:37:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpOC5-0007Gs-2c for qemu-devel@nongnu.org; Wed, 19 Jun 2013 15:37:26 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:54817) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpOC4-0007Gm-RR for qemu-devel@nongnu.org; Wed, 19 Jun 2013 15:37:25 -0400 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 19 Jun 2013 13:37:24 -0600 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 0B51A38C8042 for ; Wed, 19 Jun 2013 15:37:20 -0400 (EDT) Received: from d01av05.pok.ibm.com (d01av05.pok.ibm.com [9.56.224.195]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5JJa4jJ338190 for ; Wed, 19 Jun 2013 15:36:04 -0400 Received: from d01av05.pok.ibm.com (loopback [127.0.0.1]) by d01av05.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5JJa4Hw029380 for ; Wed, 19 Jun 2013 15:36:04 -0400 From: Anthony Liguori In-Reply-To: <1371670154-32026-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1371670154-32026-1-git-send-email-mjt@msgid.tls.msk.ru> Date: Wed, 19 Jun 2013 14:35:52 -0500 Message-ID: <87bo71opuv.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH] vl: convert -smp to qemu_opts_parse() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Tokarev Cc: qemu-devel@nongnu.org Michael Tokarev writes: > Signed-off-by: Michael Tokarev Reviewed-by: Anthony Liguori Regards, Anthony Liguori > --- > vl.c | 122 +++++++++++++++++++++++++++++++++++++----------------------------- > 1 file changed, 69 insertions(+), 53 deletions(-) > > diff --git a/vl.c b/vl.c > index f94ec9c..530fa8f 100644 > --- a/vl.c > +++ b/vl.c > @@ -1401,48 +1401,79 @@ static void numa_add(const char *optarg) > } > } > > -static void smp_parse(const char *optarg) > +static QemuOptsList qemu_smp_opts = { > + .name = "smp-opts", > + .implied_opt_name = "cpus", > + .merge_lists = true, > + .head = QTAILQ_HEAD_INITIALIZER(qemu_smp_opts.head), > + .desc = { > + { > + .name = "cpus", > + .type = QEMU_OPT_NUMBER, > + }, { > + .name = "sockets", > + .type = QEMU_OPT_NUMBER, > + }, { > + .name = "cores", > + .type = QEMU_OPT_NUMBER, > + }, { > + .name = "threads", > + .type = QEMU_OPT_NUMBER, > + }, { > + .name = "maxcpus", > + .type = QEMU_OPT_NUMBER, > + }, > + { /*End of list */ } > + }, > +}; > + > +static void smp_parse(QemuOpts *opts) > { > - int smp, sockets = 0, threads = 0, cores = 0; > - char *endptr; > - char option[128]; > + if (opts) { > > - smp = strtoul(optarg, &endptr, 10); > - if (endptr != optarg) { > - if (*endptr == ',') { > - endptr++; > - } > - } > - if (get_param_value(option, 128, "sockets", endptr) != 0) > - sockets = strtoull(option, NULL, 10); > - if (get_param_value(option, 128, "cores", endptr) != 0) > - cores = strtoull(option, NULL, 10); > - if (get_param_value(option, 128, "threads", endptr) != 0) > - threads = strtoull(option, NULL, 10); > - if (get_param_value(option, 128, "maxcpus", endptr) != 0) > - max_cpus = strtoull(option, NULL, 10); > - > - /* compute missing values, prefer sockets over cores over threads */ > - if (smp == 0 || sockets == 0) { > - sockets = sockets > 0 ? sockets : 1; > - cores = cores > 0 ? cores : 1; > - threads = threads > 0 ? threads : 1; > - if (smp == 0) { > - smp = cores * threads * sockets; > - } > - } else { > - if (cores == 0) { > + unsigned cpus = qemu_opt_get_number(opts, "cpus", 0); > + unsigned sockets = qemu_opt_get_number(opts, "sockets", 0); > + unsigned cores = qemu_opt_get_number(opts, "cores", 0); > + unsigned threads = qemu_opt_get_number(opts, "threads", 0); > + > + /* compute missing values, prefer sockets over cores over threads */ > + if (cpus == 0 || sockets == 0) { > + sockets = sockets > 0 ? sockets : 1; > + cores = cores > 0 ? cores : 1; > threads = threads > 0 ? threads : 1; > - cores = smp / (sockets * threads); > + if (cpus == 0) { > + cpus = cores * threads * sockets; > + } > } else { > - threads = smp / (cores * sockets); > + if (cores == 0) { > + threads = threads > 0 ? threads : 1; > + cores = cpus / (sockets * threads); > + } else { > + threads = cpus / (cores * sockets); > + } > } > + > + max_cpus = qemu_opt_get_number(opts, "maxcpus", 0); > + > + smp_cpus = cpus; > + smp_cores = cores > 0 ? cores : 1; > + smp_threads = threads > 0 ? threads : 1; > + > } > - smp_cpus = smp; > - smp_cores = cores > 0 ? cores : 1; > - smp_threads = threads > 0 ? threads : 1; > - if (max_cpus == 0) > + > + if (max_cpus == 0) { > max_cpus = smp_cpus; > + } > + > + if (max_cpus > 255) { > + fprintf(stderr, "Unsupported number of maxcpus\n"); > + exit(1); > + } > + if (max_cpus < smp_cpus) { > + fprintf(stderr, "maxcpus must be equal to or greater than smp\n"); > + exit(1); > + } > + > } > > static void configure_realtime(QemuOpts *opts) > @@ -2895,6 +2926,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_smp_opts); > qemu_add_opts(&qemu_boot_opts); > qemu_add_opts(&qemu_sandbox_opts); > qemu_add_opts(&qemu_add_fd_opts); > @@ -3624,18 +3656,7 @@ int main(int argc, char **argv, char **envp) > } > break; > case QEMU_OPTION_smp: > - smp_parse(optarg); > - if (smp_cpus < 1) { > - fprintf(stderr, "Invalid number of CPUs\n"); > - exit(1); > - } > - if (max_cpus < smp_cpus) { > - fprintf(stderr, "maxcpus must be equal to or greater than " > - "smp\n"); > - exit(1); > - } > - if (max_cpus > 255) { > - fprintf(stderr, "Unsupported number of maxcpus\n"); > + if (!qemu_opts_parse(qemu_find_opts("smp-opts"), optarg, 1)) { > exit(1); > } > break; > @@ -3959,12 +3980,7 @@ int main(int argc, char **argv, char **envp) > data_dir[data_dir_idx++] = CONFIG_QEMU_DATADIR; > } > > - /* > - * Default to max_cpus = smp_cpus, in case the user doesn't > - * specify a max_cpus value. > - */ > - if (!max_cpus) > - max_cpus = smp_cpus; > + smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL)); > > machine->max_cpus = machine->max_cpus ?: 1; /* Default to UP */ > if (smp_cpus > machine->max_cpus) { > -- > 1.7.10.4