aboutsummaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-03 16:38:34 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-03 16:38:34 +0000
commiteae7629bfdb25f5d89444fcae532b13e78c6d608 (patch)
tree1f9e9ac1db142372ab148abb772794b5e7a6ace4 /target-i386
parentaf655b6d827d7e56b945032adbb6359cfe58dbad (diff)
i386 return APIC ID with cpuid, by Bernhard Kauer.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2591 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/cpu.h1
-rw-r--r--target-i386/helper.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 104f31e2c2..2b4295ae17 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -530,6 +530,7 @@ typedef struct CPUX86State {
uint32_t cpuid_xlevel;
uint32_t cpuid_model[12];
uint32_t cpuid_ext2_features;
+ uint32_t cpuid_apic_id;
#ifdef USE_KQEMU
int kqemu_enabled;
diff --git a/target-i386/helper.c b/target-i386/helper.c
index ef760adad3..4656596eb1 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1653,7 +1653,7 @@ void helper_cpuid(void)
break;
case 1:
EAX = env->cpuid_version;
- EBX = 8 << 8; /* CLFLUSH size in quad words, Linux wants it. */
+ EBX = (env->cpuid_apic_id << 24) | 8 << 8; /* CLFLUSH size in quad words, Linux wants it. */
ECX = env->cpuid_ext_features;
EDX = env->cpuid_features;
break;