Revision eae7629b

b/hw/apic.c
816 816
    env->apic_state = s;
817 817
    apic_init_ipi(s);
818 818
    s->id = last_apic_id++;
819
    env->cpuid_apic_id = s->id;
819 820
    s->cpu_env = env;
820 821
    s->apicbase = 0xfee00000 | 
821 822
        (s->id ? 0 : MSR_IA32_APICBASE_BSP) | MSR_IA32_APICBASE_ENABLE;
b/target-i386/cpu.h
530 530
    uint32_t cpuid_xlevel;
531 531
    uint32_t cpuid_model[12];
532 532
    uint32_t cpuid_ext2_features;
533
    uint32_t cpuid_apic_id;
533 534
    
534 535
#ifdef USE_KQEMU
535 536
    int kqemu_enabled;
b/target-i386/helper.c
1653 1653
        break;
1654 1654
    case 1:
1655 1655
        EAX = env->cpuid_version;
1656
        EBX = 8 << 8; /* CLFLUSH size in quad words, Linux wants it. */
1656
        EBX = (env->cpuid_apic_id << 24) | 8 << 8; /* CLFLUSH size in quad words, Linux wants it. */
1657 1657
        ECX = env->cpuid_ext_features;
1658 1658
        EDX = env->cpuid_features;
1659 1659
        break;

Also available in: Unified diff