diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-04-03 16:38:34 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-04-03 16:38:34 +0000 |
| commit | eae7629bfdb25f5d89444fcae532b13e78c6d608 (patch) | |
| tree | 1f9e9ac1db142372ab148abb772794b5e7a6ace4 | |
| parent | af655b6d827d7e56b945032adbb6359cfe58dbad (diff) | |
| download | focaccia-qemu-eae7629bfdb25f5d89444fcae532b13e78c6d608.tar.gz focaccia-qemu-eae7629bfdb25f5d89444fcae532b13e78c6d608.zip | |
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
| -rw-r--r-- | hw/apic.c | 1 | ||||
| -rw-r--r-- | target-i386/cpu.h | 1 | ||||
| -rw-r--r-- | target-i386/helper.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/hw/apic.c b/hw/apic.c index 8c9776195e..f964360c86 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -816,6 +816,7 @@ int apic_init(CPUState *env) env->apic_state = s; apic_init_ipi(s); s->id = last_apic_id++; + env->cpuid_apic_id = s->id; s->cpu_env = env; s->apicbase = 0xfee00000 | (s->id ? 0 : MSR_IA32_APICBASE_BSP) | MSR_IA32_APICBASE_ENABLE; 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; |