[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 30/30] vl: smp_parse: cleanups
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PULL 30/30] vl: smp_parse: cleanups |
Date: |
Tue, 21 Jun 2016 17:40:13 +0200 |
On Thu, 16 Jun 2016 16:16:25 +0200
Paolo Bonzini <address@hidden> wrote:
> From: Andrew Jones <address@hidden>
>
> No functional changes; only some code movement and removal of
> dead code (impossible conditions). Also, max_cpus can be
> initialized to 1, like smp_cpus, because it's either set by the
> user or set to smp_cpus, when smp_cpus is set by the user, or
> set to 1, when nothing is set.
>
> Signed-off-by: Andrew Jones <address@hidden>
> Message-Id: <address@hidden>
> Signed-off-by: Paolo Bonzini <address@hidden>
this patch broke master with following CLI
-machine q35,accel=tcg -smp 2,cores=3,sockets=2,maxcpus=6
> ---
> vl.c | 34 +++++++++++++++-------------------
> 1 file changed, 15 insertions(+), 19 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 99c3030..e69ebfd 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -154,7 +154,7 @@ CharDriverState *sclp_hds[MAX_SCLP_CONSOLES];
> int win2k_install_hack = 0;
> int singlestep = 0;
> int smp_cpus = 1;
> -int max_cpus = 0;
> +int max_cpus = 1;
> int smp_cores = 1;
> int smp_threads = 1;
> int acpi_enabled = 1;
> @@ -1223,7 +1223,6 @@ static QemuOptsList qemu_smp_opts = {
> static void smp_parse(QemuOpts *opts)
> {
> if (opts) {
> -
> 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);
> @@ -1251,6 +1250,17 @@ static void smp_parse(QemuOpts *opts)
> }
>
> max_cpus = qemu_opt_get_number(opts, "maxcpus", cpus);
> +
> + if (max_cpus > MAX_CPUMASK_BITS) {
> + error_report("unsupported number of maxcpus");
> + exit(1);
> + }
> +
> + if (max_cpus < cpus) {
> + error_report("maxcpus must be equal to or greater than
> smp");
> + exit(1);
> + }
> +
> if (sockets * cores * threads > max_cpus) {
> error_report("cpu topology: "
> "sockets (%u) * cores (%u) * threads (%u) >
> " @@ -1260,25 +1270,11 @@ static void smp_parse(QemuOpts *opts)
> }
>
> smp_cpus = cpus;
> - smp_cores = cores > 0 ? cores : 1;
> - smp_threads = threads > 0 ? threads : 1;
> -
> - }
> -
> - if (max_cpus == 0) {
> - max_cpus = smp_cpus;
> - }
> -
> - if (max_cpus > MAX_CPUMASK_BITS) {
> - error_report("unsupported number of maxcpus");
> - exit(1);
> - }
> - if (max_cpus < smp_cpus) {
> - error_report("maxcpus must be equal to or greater than smp");
> - exit(1);
> + smp_cores = cores;
> + smp_threads = threads;
> }
>
> - if (smp_cpus > 1 || smp_cores > 1 || smp_threads > 1) {
> + if (smp_cpus > 1) {
> Error *blocker = NULL;
> error_setg(&blocker, QERR_REPLAY_NOT_SUPPORTED, "smp");
> replay_add_blocker(blocker);
- [Qemu-devel] [PULL 18/30] nbd: More debug typo fixes, use correct formats, (continued)
- [Qemu-devel] [PULL 18/30] nbd: More debug typo fixes, use correct formats, Paolo Bonzini, 2016/06/16
- [Qemu-devel] [PULL 19/30] nbd: Quit server after any write error, Paolo Bonzini, 2016/06/16
- [Qemu-devel] [PULL 23/30] nbd: Clean up ioctl handling of qemu-nbd -c, Paolo Bonzini, 2016/06/16
- [Qemu-devel] [PULL 22/30] nbd: Group all Linux-specific ioctl code in one place, Paolo Bonzini, 2016/06/16
- [Qemu-devel] [PULL 26/30] scsi: esp: check buffer length before reading scsi command, Paolo Bonzini, 2016/06/16
- [Qemu-devel] [PULL 25/30] nbd: Avoid magic number for NBD max name size, Paolo Bonzini, 2016/06/16
- [Qemu-devel] [PULL 24/30] nbd: Detect servers that send unexpected error values, Paolo Bonzini, 2016/06/16
- [Qemu-devel] [PULL 29/30] scsi: esp: make cmdbuf big enough for maximum CDB size, Paolo Bonzini, 2016/06/16
- [Qemu-devel] [PULL 27/30] scsi: esp: respect FIFO invariant after message phase, Paolo Bonzini, 2016/06/16
- [Qemu-devel] [PULL 30/30] vl: smp_parse: cleanups, Paolo Bonzini, 2016/06/16
- Re: [Qemu-devel] [PULL 30/30] vl: smp_parse: cleanups,
Igor Mammedov <=
- [Qemu-devel] [PULL 28/30] scsi: esp: clean up handle_ti/esp_do_dma if s->do_cmd, Paolo Bonzini, 2016/06/16
- Re: [Qemu-devel] [PULL 00/30] KVM, build, NBD, SCSI patches for 2016-06-16, Peter Maydell, 2016/06/16
- Re: [Qemu-devel] [PULL 00/30] KVM, build, NBD, SCSI patches for 2016-06-16, Paolo Bonzini, 2016/06/16
- Re: [Qemu-devel] [PULL 00/30] KVM, build, NBD, SCSI patches for 2016-06-16, Peter Maydell, 2016/06/16
- Re: [Qemu-devel] [PULL 00/30] KVM, build, NBD, SCSI patches for 2016-06-16, Paolo Bonzini, 2016/06/16
- Re: [Qemu-devel] [PULL 00/30] KVM, build, NBD, SCSI patches for 2016-06-16, Peter Maydell, 2016/06/16