diff options
Diffstat (limited to 'target-i386/cpu.c')
| -rw-r--r-- | target-i386/cpu.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 4b43759ec5..69c3570a15 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2049,8 +2049,6 @@ static void mce_init(X86CPU *cpu) } } -#define MSI_ADDR_BASE 0xfee00000 - #ifndef CONFIG_USER_ONLY static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) { @@ -2090,7 +2088,7 @@ static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) on the global memory bus. */ /* XXX: what if the base changes? */ sysbus_mmio_map_overlap(SYS_BUS_DEVICE(env->apic_state), 0, - MSI_ADDR_BASE, 0x1000); + APIC_DEFAULT_ADDRESS, 0x1000); apic_mapped = 1; } } @@ -2131,14 +2129,14 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) env->cpuid_ext3_features &= TCG_EXT3_FEATURES; env->cpuid_svm_features &= TCG_SVM_FEATURES; } else { -#ifdef CONFIG_KVM - filter_features_for_kvm(cpu); -#endif if (check_cpuid && kvm_check_features_against_host(cpu) && enforce_cpuid) { error_setg(errp, "Host's CPU doesn't support requested features"); return; } +#ifdef CONFIG_KVM + filter_features_for_kvm(cpu); +#endif } #ifndef CONFIG_USER_ONLY |