[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL v6 10/42] vl.c: Replace smp global variables with
From: |
Laurent Desnogues |
Subject: |
Re: [Qemu-devel] [PULL v6 10/42] vl.c: Replace smp global variables with smp machine properties |
Date: |
Mon, 8 Jul 2019 16:56:56 +0200 |
Hi,
On Sat, Jul 6, 2019 at 12:40 AM Eduardo Habkost <address@hidden> wrote:
>
> From: Like Xu <address@hidden>
>
> The global smp variables in vl.c are completely replaced with machine
> properties.
>
> Form this commit, the smp_cpus/smp_cores/smp_threads/max_cpus are deprecated
> and only machine properties within MachineState are fully applied and enabled.
Wouldn't it make sense to now remove the declarations in
include/sysemu/cpus.h and include/sysemu/sysemu.h?
Thanks,
Laurent
> Signed-off-by: Like Xu <address@hidden>
> Reviewed-by: Alistair Francis <address@hidden>
> Message-Id: <address@hidden>
> Reviewed-by: Eduardo Habkost <address@hidden>
> Signed-off-by: Eduardo Habkost <address@hidden>
> ---
> vl.c | 53 ++++++++++++++++++++++++++---------------------------
> 1 file changed, 26 insertions(+), 27 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index d657faec03..56aa221385 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -163,10 +163,6 @@ static Chardev **serial_hds;
> Chardev *parallel_hds[MAX_PARALLEL_PORTS];
> int win2k_install_hack = 0;
> int singlestep = 0;
> -int smp_cpus;
> -unsigned int max_cpus;
> -int smp_cores = 1;
> -int smp_threads = 1;
> int acpi_enabled = 1;
> int no_hpet = 0;
> int fd_bootchk = 1;
> @@ -1265,8 +1261,9 @@ static void smp_parse(QemuOpts *opts)
> sockets = sockets > 0 ? sockets : 1;
> cpus = cores * threads * sockets;
> } else {
> - max_cpus = qemu_opt_get_number(opts, "maxcpus", cpus);
> - sockets = max_cpus / (cores * threads);
> + current_machine->smp.max_cpus =
> + qemu_opt_get_number(opts, "maxcpus", cpus);
> + sockets = current_machine->smp.max_cpus / (cores * threads);
> }
> } else if (cores == 0) {
> threads = threads > 0 ? threads : 1;
> @@ -1283,34 +1280,37 @@ static void smp_parse(QemuOpts *opts)
> exit(1);
> }
>
> - max_cpus = qemu_opt_get_number(opts, "maxcpus", cpus);
> + current_machine->smp.max_cpus =
> + qemu_opt_get_number(opts, "maxcpus", cpus);
>
> - if (max_cpus < cpus) {
> + if (current_machine->smp.max_cpus < cpus) {
> error_report("maxcpus must be equal to or greater than smp");
> exit(1);
> }
>
> - if (sockets * cores * threads > max_cpus) {
> + if (sockets * cores * threads > current_machine->smp.max_cpus) {
> error_report("cpu topology: "
> "sockets (%u) * cores (%u) * threads (%u) > "
> "maxcpus (%u)",
> - sockets, cores, threads, max_cpus);
> + sockets, cores, threads,
> + current_machine->smp.max_cpus);
> exit(1);
> }
>
> - if (sockets * cores * threads != max_cpus) {
> + if (sockets * cores * threads != current_machine->smp.max_cpus) {
> warn_report("Invalid CPU topology deprecated: "
> "sockets (%u) * cores (%u) * threads (%u) "
> "!= maxcpus (%u)",
> - sockets, cores, threads, max_cpus);
> + sockets, cores, threads,
> + current_machine->smp.max_cpus);
> }
>
> - smp_cpus = cpus;
> - smp_cores = cores;
> - smp_threads = threads;
> + current_machine->smp.cpus = cpus;
> + current_machine->smp.cores = cores;
> + current_machine->smp.threads = threads;
> }
>
> - if (smp_cpus > 1) {
> + if (current_machine->smp.cpus > 1) {
> Error *blocker = NULL;
> error_setg(&blocker, QERR_REPLAY_NOT_SUPPORTED, "smp");
> replay_add_blocker(blocker);
> @@ -4009,26 +4009,25 @@ int main(int argc, char **argv, char **envp)
> machine_class->default_cpus = machine_class->default_cpus ?: 1;
>
> /* default to machine_class->default_cpus */
> - smp_cpus = machine_class->default_cpus;
> - max_cpus = machine_class->default_cpus;
> + current_machine->smp.cpus = machine_class->default_cpus;
> + current_machine->smp.max_cpus = machine_class->default_cpus;
> + current_machine->smp.cores = 1;
> + current_machine->smp.threads = 1;
>
> smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL));
>
> - current_machine->smp.cpus = smp_cpus;
> - current_machine->smp.max_cpus = max_cpus;
> - current_machine->smp.cores = smp_cores;
> - current_machine->smp.threads = smp_threads;
> -
> /* sanity-check smp_cpus and max_cpus against machine_class */
> - if (smp_cpus < machine_class->min_cpus) {
> + if (current_machine->smp.cpus < machine_class->min_cpus) {
> error_report("Invalid SMP CPUs %d. The min CPUs "
> - "supported by machine '%s' is %d", smp_cpus,
> + "supported by machine '%s' is %d",
> + current_machine->smp.cpus,
> machine_class->name, machine_class->min_cpus);
> exit(1);
> }
> - if (max_cpus > machine_class->max_cpus) {
> + if (current_machine->smp.max_cpus > machine_class->max_cpus) {
> error_report("Invalid SMP CPUs %d. The max CPUs "
> - "supported by machine '%s' is %d", max_cpus,
> + "supported by machine '%s' is %d",
> + current_machine->smp.max_cpus,
> machine_class->name, machine_class->max_cpus);
> exit(1);
> }
> --
> 2.18.0.rc1.1.g3f1ff2140
>
>
- [Qemu-devel] [PULL v6 04/42] hw/ppc: Replace global smp variables with machine smp properties, (continued)
- [Qemu-devel] [PULL v6 04/42] hw/ppc: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 01/42] hw/boards: Add struct CpuTopology to MachineState, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 02/42] machine: Refactor smp-related call chains to pass MachineState, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 05/42] hw/riscv: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 06/42] hw/s390x: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 03/42] general: Replace global smp variables with smp machine properties, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 07/42] hw/i386: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 09/42] hw: Replace global smp variables with MachineState for all remaining archs, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 12/42] hw/i386: Adjust nr_dies with configured smp_dies for PCMachine, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 10/42] vl.c: Replace smp global variables with smp machine properties, Eduardo Habkost, 2019/07/05
- Re: [Qemu-devel] [PULL v6 10/42] vl.c: Replace smp global variables with smp machine properties,
Laurent Desnogues <=
- [Qemu-devel] [PULL v6 13/42] i386/cpu: Consolidate die-id validity in smp context, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 08/42] hw/arm: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 11/42] i386: Add die-level cpu topology to x86CPU on PCMachine, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 16/42] machine: show if CLI option '-numa node, mem' is supported in QAPI schema, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 15/42] pc: fix possible NULL pointer dereference in pc_machine_get_device_memory_region_size(), Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 14/42] i386: Update new x86_apicid parsing rules with die_offset support, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 17/42] numa: deprecate 'mem' parameter of '-numa node' option, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 18/42] numa: deprecate implict memory distribution between nodes, Eduardo Habkost, 2019/07/05
- [Qemu-devel] [PULL v6 19/42] hppa: Delete unused hppa_cpu_list() function, Eduardo Habkost, 2019/07/05