openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: Move exception handling to the same place as other events 

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Gleb Natapov 2009-07-09 15:33:51 +03:00 committed by Avi Kivity
parent a205bc19f0
commit b59bb7bdf0
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,13 +223,6 @@ void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code)
} }
EXPORT_SYMBOL_GPL(kvm_queue_exception_e); EXPORT_SYMBOL_GPL(kvm_queue_exception_e);
static void __queue_exception(struct kvm_vcpu *vcpu)
{
kvm_x86_ops->queue_exception(vcpu, vcpu->arch.exception.nr,
vcpu->arch.exception.has_error_code,
vcpu->arch.exception.error_code);
}
/* /*
* Load the pae pdptrs. Return true is they are all valid. * Load the pae pdptrs. Return true is they are all valid.
*/ */
@ -3491,9 +3484,16 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu)
kvm_x86_ops->update_cr8_intercept(vcpu, tpr, max_irr); kvm_x86_ops->update_cr8_intercept(vcpu, tpr, max_irr);
} }
static void inject_pending_irq(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) static void inject_pending_event(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
{ {
/* try to reinject previous events if any */ /* try to reinject previous events if any */
if (vcpu->arch.exception.pending) {
kvm_x86_ops->queue_exception(vcpu, vcpu->arch.exception.nr,
vcpu->arch.exception.has_error_code,
vcpu->arch.exception.error_code);
return;
}
if (vcpu->arch.nmi_injected) { if (vcpu->arch.nmi_injected) {
kvm_x86_ops->set_nmi(vcpu); kvm_x86_ops->set_nmi(vcpu);
return; return;
@ -3574,10 +3574,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
goto out; goto out;
} }
if (vcpu->arch.exception.pending) inject_pending_event(vcpu, kvm_run);
__queue_exception(vcpu);
else
inject_pending_irq(vcpu, kvm_run);
/* enable NMI/IRQ window open exits if needed */ /* enable NMI/IRQ window open exits if needed */
if (vcpu->arch.nmi_pending) if (vcpu->arch.nmi_pending)