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

diff --git a/hw/apic.c b/hw/apic.c
index 8c9776195e4ce4c98cf72c5bd3d1af3542b84e06..f964360c86b321f692e48900860590387b40554e 100644 (file)
--- 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 104f31e2c262fc13ba4ce36ba575c073e156b509..2b4295ae1780630b800443871a0f3a11e172f0eb 100644 (file)
--- 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 ef760adad3bb9c2d3e3e293df827b19609133240..4656596eb1baa8dfc9e4bba9c99804ac735db6d5 100644 (file)
--- 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;