[08/12] cmdline: convert -smp to QemuOpts

This introduces a new option group, but it is mostly trivial.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qemu-config.c |   31 +++++++++++++++++++++++++++++
 vl.c          |   61 +++++++++++++++++++++++++-------------------------------
 2 files changed, 58 insertions(+), 34 deletions(-)

On Tue, Mar 20, 2012 at 09:01:34AM +0100, Paolo Bonzini wrote:
> This introduces a new option group, but it is mostly trivial.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  qemu-config.c |   31 +++++++++++++++++++++++++++++
>  vl.c          |   61 +++++++++++++++++++++++++-------------------------------
>  2 files changed, 58 insertions(+), 34 deletions(-)
> 
> diff --git a/qemu-config.c b/qemu-config.c
> index 8f0923e..c1a4642 100644
> --- a/qemu-config.c
> +++ b/qemu-config.c
> @@ -600,6 +600,36 @@ static QemuOptsList qemu_machine_opts = {
>      },
>  };
>  
> +QemuOptsList qemu_smp_opts = {
> +    .name = "smp",
> +    .head = QTAILQ_HEAD_INITIALIZER(qemu_smp_opts.head),
> +    .implied_opt_name = "cpus",
> +    .desc = {
> +        {
> +            .name = "cpus",
> +            .type = QEMU_OPT_NUMBER,
> +            .help = "Number of CPUs",
> +        }, {
> +            .name = "sockets",
> +            .type = QEMU_OPT_NUMBER,
> +            .help = "Number of sockets",
> +        }, {
> +            .name = "cores",
> +            .type = QEMU_OPT_NUMBER,
> +            .help = "Number of cores per socket",
> +        }, {
> +            .name = "threads",
> +            .type = QEMU_OPT_NUMBER,
> +            .help = "Number of simultaneous threads per core",
> +        }, {
> +            .name = "maxcpus",
> +            .type = QEMU_OPT_NUMBER,
> +            .help = "Maximum number of pluggable CPUs",
> +        },
> +        { /*End of list */ }
> +    },
> +};
> +
>  QemuOptsList qemu_boot_opts = {
>      .name = "boot-opts",
>      .head = QTAILQ_HEAD_INITIALIZER(qemu_boot_opts.head),
> @@ -639,6 +669,7 @@ static QemuOptsList *vm_config_groups[32] = {
>      &qemu_trace_opts,
>      &qemu_option_rom_opts,
>      &qemu_machine_opts,
> +    &qemu_smp_opts,
>      &qemu_boot_opts,
>      &qemu_iscsi_opts,
>      NULL,
> diff --git a/vl.c b/vl.c
> index 1fc5044..ce55468 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -995,26 +995,15 @@ static void numa_add(const char *optarg)
>      return;
>  }
>  
> -static void smp_parse(const char *optarg)
> +static int smp_init_func(QemuOpts *opts, void *opaque)
>  {
>      int smp, sockets = 0, threads = 0, cores = 0;
> -    char *endptr;
> -    char option[128];
>  
> -    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);
> +    smp = qemu_opt_get_number(opts, "cpus", 0);
> +    sockets = qemu_opt_get_number(opts, "sockets", 0);
> +    cores = qemu_opt_get_number(opts, "cores", 0);
> +    threads = qemu_opt_get_number(opts, "threads", 0);
> +    max_cpus = qemu_opt_get_number(opts, "maxcpus", 0);
>  
>      /* compute missing values, prefer sockets over cores over threads */
>      if (smp == 0 || sockets == 0) {
> @@ -1035,8 +1024,22 @@ static void smp_parse(const char *optarg)
>      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 (smp_cpus < 1) {
> +        fprintf(stderr, "Invalid number of CPUs\n");
> +        return 1;
> +    }
> +    if (max_cpus < smp_cpus) {
> +        fprintf(stderr, "maxcpus must be equal to or greater than cpus\n");
> +        return 1;
> +    }
> +    if (max_cpus > 255) {
> +        fprintf(stderr, "Unsupported number of maxcpus\n");
> +        return 1;
> +    }
> +    return 0;
>  }
>  
>  /***********************************************************/
> @@ -2967,20 +2970,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");
> -                    exit(1);
> -                }
> +                qemu_opts_parse(qemu_find_opts("smp"), optarg, 1);
>                  break;
>  	    case QEMU_OPTION_vnc:
>  #ifdef CONFIG_VNC
> @@ -3230,9 +3220,12 @@ int main(int argc, char **argv, char **envp)
>       * Default to max_cpus = smp_cpus, in case the user doesn't
>       * specify a max_cpus value.
>       */
> -    if (!max_cpus)
> +    if (qemu_opts_foreach(qemu_find_opts("smp"), smp_init_func, NULL, 1) != 0) {
> +        exit(1);
> +    }
> +    if (!max_cpus) {
>          max_cpus = smp_cpus;
> -
> +    }
Isn't this 'if' block redundant? smp_init_func sets max_cpus = smp_cpus if !max_cpus.

>      machine->max_cpus = machine->max_cpus ?: 1; /* Default to UP */
>      if (smp_cpus > machine->max_cpus) {
>          fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus "
> -- 
> 1.7.7.6
> 
> 
>

Il 13/04/2012 14:42, Takayuki Konishi ha scritto:
>> > -    if (!max_cpus)
>> > +    if (qemu_opts_foreach(qemu_find_opts("smp"), smp_init_func, NULL, 1) != 0) {
>> > +        exit(1);
>> > +    }
>> > +    if (!max_cpus) {
>> >          max_cpus = smp_cpus;
>> > -
>> > +    }
> Isn't this 'if' block redundant? smp_init_func sets max_cpus = smp_cpus if !max_cpus.

smp_init_func is only run if -smp is given on the command line, just
like smp_parse before this patch.

Paolo