lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Disable CR8 intercept if tpr patching is active

Browse Source 
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Gleb Natapov
2009-05-11 13:35:54 +03:00
committed by Avi Kivity
parent 36752c9b91
commit 8db3baa2db
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kvm/x86.c
View File

@@ -3142,7 +3142,10 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu)
if (!kvm_x86_ops->update_cr8_intercept) if (!kvm_x86_ops->update_cr8_intercept)
return; return;
max_irr = kvm_lapic_find_highest_irr(vcpu); if (!vcpu->arch.apic->vapic_addr)
max_irr = kvm_lapic_find_highest_irr(vcpu);
else
max_irr = -1;
if (max_irr != -1) if (max_irr != -1)
max_irr >>= 4; max_irr >>= 4;
@@ -3249,10 +3252,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
kvm_x86_ops->enable_irq_window(vcpu); kvm_x86_ops->enable_irq_window(vcpu);
if (kvm_lapic_enabled(vcpu)) { if (kvm_lapic_enabled(vcpu)) {
if (!vcpu->arch.apic->vapic_addr) update_cr8_intercept(vcpu);
update_cr8_intercept(vcpu); kvm_lapic_sync_to_vapic(vcpu);
else
kvm_lapic_sync_to_vapic(vcpu);
} }
up_read(&vcpu->kvm->slots_lock); up_read(&vcpu->kvm->slots_lock);