summaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-09-16 19:50:24 +0400
committerEduardo Habkost <ehabkost@redhat.com>2016-09-27 16:17:17 -0300
commiteab60fb9f5e7bb6738b0619cfd0057d3a9d21330 (patch)
tree81125c6897e6d9ad7835bcbd1f7350a23aab5869 /target-i386
parent0c3d7c0051576d220e6da0a8ac08f2d8482e2f0b (diff)
downloadqemu-eab60fb9f5e7bb6738b0619cfd0057d3a9d21330.tar.gz
qemu-eab60fb9f5e7bb6738b0619cfd0057d3a9d21330.tar.bz2
qemu-eab60fb9f5e7bb6738b0619cfd0057d3a9d21330.zip
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>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/cpu.c8
1 files changed, 4 insertions, 4 deletions
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: