Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73a6d941 authored by Tang Chen's avatar Tang Chen Committed by Paolo Bonzini
Browse files

kvm: Use APIC_DEFAULT_PHYS_BASE macro as the apic access page address. 



We have APIC_DEFAULT_PHYS_BASE defined as 0xfee00000, which is also the address of
apic access page. So use this macro.

Signed-off-by: default avatarTang Chen <tangchen@cn.fujitsu.com>
Reviewed-by: default avatarGleb Natapov <gleb@kernel.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2c69c1a3

arch/x86/kvm/svm.c

+2 −1
Original line number Diff line number Diff line
@@ -1257,7 +1257,8 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) 
	svm->asid_generation = 0;

	init_vmcb(svm);



	svm->vcpu.arch.apic_base = 0xfee00000 | MSR_IA32_APICBASE_ENABLE;

	svm->vcpu.arch.apic_base = APIC_DEFAULT_PHYS_BASE |

				   MSR_IA32_APICBASE_ENABLE;

	if (kvm_vcpu_is_bsp(&svm->vcpu))

		svm->vcpu.arch.apic_base |= MSR_IA32_APICBASE_BSP;

arch/x86/kvm/vmx.c

+3 −3
Original line number Diff line number Diff line
@@ -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;