Re: [Qemu-devel] [PULL v6 10/42] vl.c: Replace smp global variables with smp machine properties
On Mon, Jul 08, 2019 at 04:56:56PM +0200, Laurent Desnogues wrote: > Hi, > > On Sat, Jul 6, 2019 at 12:40 AM Eduardo Habkost wrote: > > > > From: Like Xu > > > > 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? You're right. This will be done in a follow up patch. -- Eduardo
Re: [Qemu-devel] [PULL v6 10/42] vl.c: Replace smp global variables with smp machine properties
Hi,
On Sat, Jul 6, 2019 at 12:40 AM Eduardo Habkost wrote:
>
> From: Like Xu
>
> 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
> Reviewed-by: Alistair Francis
> Message-Id: <20190518205428.90532-11-like...@linux.intel.com>
> Reviewed-by: Eduardo Habkost
> Signed-off-by: Eduardo Habkost
> ---
> 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(, 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,
[Qemu-devel] [PULL v6 10/42] vl.c: Replace smp global variables with smp machine properties
From: Like Xu
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.
Signed-off-by: Like Xu
Reviewed-by: Alistair Francis
Message-Id: <20190518205428.90532-11-like...@linux.intel.com>
Reviewed-by: Eduardo Habkost
Signed-off-by: Eduardo Habkost
---
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(, 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,
