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

Commit 8db3baa2 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: Disable CR8 intercept if tpr patching is active 



Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 36752c9b

arch/x86/kvm/x86.c

+6 −5
Original line number Diff line number Diff line
@@ -3142,7 +3142,10 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu) 
	if (!kvm_x86_ops->update_cr8_intercept)

		return;



	if (!vcpu->arch.apic->vapic_addr)

		max_irr = kvm_lapic_find_highest_irr(vcpu);

	else

		max_irr = -1;



	if (max_irr != -1)

		max_irr >>= 4;
@@ -3249,9 +3252,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		kvm_x86_ops->enable_irq_window(vcpu);



	if (kvm_lapic_enabled(vcpu)) {

		if (!vcpu->arch.apic->vapic_addr)

		update_cr8_intercept(vcpu);

		else

		kvm_lapic_sync_to_vapic(vcpu);

	}