diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-09-16 19:50:24 +0400 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-09-27 16:17:17 -0300 |
| commit | eab60fb9f5e7bb6738b0619cfd0057d3a9d21330 (patch) | |
| tree | 81125c6897e6d9ad7835bcbd1f7350a23aab5869 | |
| parent | 0c3d7c0051576d220e6da0a8ac08f2d8482e2f0b (diff) | |
linux-user: remove #define smp_{cores, threads}
Those are unneeded now that CPUState nr_{cores,threads} is always
initialized.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | include/sysemu/cpus.h | 5 | ||||
| -rw-r--r-- | target-i386/cpu.c | 8 | ||||
| -rw-r--r-- | target-ppc/translate_init.c | 3 |
3 files changed, 7 insertions, 9 deletions
diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h index fe992a8946..3728a1ea7e 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -29,12 +29,9 @@ void qtest_clock_warp(int64_t dest); #ifndef CONFIG_USER_ONLY /* vl.c */ +/* *-user doesn't have configurable SMP topology */ extern int smp_cores; extern int smp_threads; -#else -/* *-user doesn't have configurable SMP topology */ -#define smp_cores 1 -#define smp_threads 1 #endif void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg); diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 7a5da99222..a5d3b1af75 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2498,13 +2498,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, switch (count) { case 0: - *eax = apicid_core_offset(smp_cores, smp_threads); - *ebx = smp_threads; + *eax = apicid_core_offset(cs->nr_cores, cs->nr_threads); + *ebx = cs->nr_threads; *ecx |= CPUID_TOPOLOGY_LEVEL_SMT; break; case 1: - *eax = apicid_pkg_offset(smp_cores, smp_threads); - *ebx = smp_cores * smp_threads; + *eax = apicid_pkg_offset(cs->nr_cores, cs->nr_threads); + *ebx = cs->nr_cores * cs->nr_threads; *ecx |= CPUID_TOPOLOGY_LEVEL_CORE; break; default: diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 407ccb93a3..b66b40b82f 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -9943,7 +9943,8 @@ static void ppc_cpu_unrealizefn(DeviceState *dev, Error **errp) int ppc_get_compat_smt_threads(PowerPCCPU *cpu) { - int ret = MIN(smp_threads, kvmppc_smt_threads()); + CPUState *cs = CPU(cpu); + int ret = MIN(cs->nr_threads, kvmppc_smt_threads()); switch (cpu->cpu_version) { case CPU_POWERPC_LOGICAL_2_05: |