mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vl.c: Replace smp global variables with smp machine properties

Browse Source 
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 <like.xu@linux.intel.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20190518205428.90532-11-like.xu@linux.intel.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Like Xu 2019-05-19 04:54:28 +08:00 committed by Eduardo Habkost
parent 33decbd2d3
commit a5e0b33119
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
vl.c
View File

@ -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);
}