aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/x86.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index a84c96a7ea5e..ae6250b19726 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3071,8 +3071,7 @@ static int dm_request_for_irq_injection(struct kvm_vcpu *vcpu,
3071{ 3071{
3072 return (!irqchip_in_kernel(vcpu->kvm) && !kvm_cpu_has_interrupt(vcpu) && 3072 return (!irqchip_in_kernel(vcpu->kvm) && !kvm_cpu_has_interrupt(vcpu) &&
3073 kvm_run->request_interrupt_window && 3073 kvm_run->request_interrupt_window &&
3074 vcpu->arch.interrupt_window_open && 3074 kvm_arch_interrupt_allowed(vcpu));
3075 (kvm_x86_ops->get_rflags(vcpu) & X86_EFLAGS_IF));
3076} 3075}
3077 3076
3078static void post_kvm_run_save(struct kvm_vcpu *vcpu, 3077static void post_kvm_run_save(struct kvm_vcpu *vcpu,
@@ -3085,7 +3084,7 @@ static void post_kvm_run_save(struct kvm_vcpu *vcpu,
3085 kvm_run->ready_for_interrupt_injection = 1; 3084 kvm_run->ready_for_interrupt_injection = 1;
3086 else 3085 else
3087 kvm_run->ready_for_interrupt_injection = 3086 kvm_run->ready_for_interrupt_injection =
3088 (vcpu->arch.interrupt_window_open && 3087 (kvm_arch_interrupt_allowed(vcpu) &&
3089 !kvm_cpu_has_interrupt(vcpu)); 3088 !kvm_cpu_has_interrupt(vcpu));
3090} 3089}
3091 3090