|
@@ -4023,13 +4023,13 @@ static int alloc_apic_access_page(struct kvm *kvm)
|
|
|
goto out;
|
|
|
kvm_userspace_mem.slot = APIC_ACCESS_PAGE_PRIVATE_MEMSLOT;
|
|
|
kvm_userspace_mem.flags = 0;
|
|
|
- kvm_userspace_mem.guest_phys_addr = 0xfee00000ULL;
|
|
|
+ kvm_userspace_mem.guest_phys_addr = APIC_DEFAULT_PHYS_BASE;
|
|
|
kvm_userspace_mem.memory_size = PAGE_SIZE;
|
|
|
r = __kvm_set_memory_region(kvm, &kvm_userspace_mem);
|
|
|
if (r)
|
|
|
goto out;
|
|
|
|
|
|
- page = gfn_to_page(kvm, 0xfee00);
|
|
|
+ page = gfn_to_page(kvm, APIC_DEFAULT_PHYS_BASE >> PAGE_SHIFT);
|
|
|
if (is_error_page(page)) {
|
|
|
r = -EFAULT;
|
|
|
goto out;
|
|
@@ -4502,7 +4502,7 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu)
|
|
|
|
|
|
vmx->vcpu.arch.regs[VCPU_REGS_RDX] = get_rdx_init_val();
|
|
|
kvm_set_cr8(&vmx->vcpu, 0);
|
|
|
- apic_base_msr.data = 0xfee00000 | MSR_IA32_APICBASE_ENABLE;
|
|
|
+ apic_base_msr.data = APIC_DEFAULT_PHYS_BASE | MSR_IA32_APICBASE_ENABLE;
|
|
|
if (kvm_vcpu_is_bsp(&vmx->vcpu))
|
|
|
apic_base_msr.data |= MSR_IA32_APICBASE_BSP;
|
|
|
apic_base_msr.host_initiated = true;
|