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

Commit 3b99ab24 authored by Michael Riepe's avatar Michael Riepe Committed by Linus Torvalds
Browse files

[PATCH] KVM: Don't touch the virtual apic vt registers on 32-bit 



Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 873a7c42

drivers/kvm/vmx.c

+2 −0
Original line number Diff line number Diff line
@@ -1175,8 +1175,10 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu) 
                               VM_ENTRY_CONTROLS, 0);

	vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, 0);  /* 22.2.1 */



#ifdef CONFIG_X86_64

	vmcs_writel(VIRTUAL_APIC_PAGE_ADDR, 0);

	vmcs_writel(TPR_THRESHOLD, 0);

#endif



	vmcs_writel(CR0_GUEST_HOST_MASK, KVM_GUEST_CR0_MASK);

	vmcs_writel(CR4_GUEST_HOST_MASK, KVM_GUEST_CR4_MASK);