projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
09f037a
)
KVM: VMX: use kvm_event_needs_reinjection
author
Wanpeng Li
<
[email protected]
>
Thu, 24 Aug 2017 10:35:08 +0000
(
03:35
-0700)
committer
Paolo Bonzini
<
[email protected]
>
Thu, 24 Aug 2017 16:09:19 +0000
(18:09 +0200)
Use kvm_event_needs_reinjection() encapsulation.
Cc: Paolo Bonzini <
[email protected]
>
Cc: Radim Krčmář <
[email protected]
>
Signed-off-by: Wanpeng Li <
[email protected]
>
Signed-off-by: Paolo Bonzini <
[email protected]
>
arch/x86/kvm/vmx.c
patch
|
blob
|
history
diff --git
a/arch/x86/kvm/vmx.c
b/arch/x86/kvm/vmx.c
index 31ab27ea23186cac67b93e74d0dedcec1bac6a06..1ee5fe7ea5ffc425dfa38e5e9b3b41b888216c31 100644
(file)
--- a/
arch/x86/kvm/vmx.c
+++ b/
arch/x86/kvm/vmx.c
@@
-11012,9
+11012,7
@@
static int vmx_check_nested_events(struct kvm_vcpu *vcpu, bool external_intr)
{
struct vcpu_vmx *vmx = to_vmx(vcpu);
- if (vcpu->arch.exception.pending ||
- vcpu->arch.nmi_injected ||
- vcpu->arch.interrupt.pending)
+ if (kvm_event_needs_reinjection(vcpu))
return -EBUSY;
if (nested_cpu_has_preemption_timer(get_vmcs12(vcpu)) &&