aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Leshenko <nikita.leshchenko@oracle.com>2017-11-05 08:52:31 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2017-11-17 07:20:19 -0500
commit7d2253684dd10eb800ee1898ad7904044ae88ed6 (patch)
tree74fd84bd880885d35b78a7df9e0c596e73b218a0
parentda3fe7bdfada217bf02ecd0477fcdb55da50944c (diff)
KVM: x86: ioapic: Remove redundant check for Remote IRR in ioapic_set_irq
Remote IRR for level-triggered interrupts was previously checked in ioapic_set_irq, but since we now have a check in ioapic_service we can remove the redundant check from ioapic_set_irq. This commit doesn't change semantics. Signed-off-by: Nikita Leshenko <nikita.leshchenko@oracle.com> Reviewed-by: Liran Alon <liran.alon@oracle.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Wanpeng Li <wanpeng.li@hotmail.com> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
-rw-r--r--arch/x86/kvm/ioapic.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c
index 5c9231139243..6df150eaaa78 100644
--- a/arch/x86/kvm/ioapic.c
+++ b/arch/x86/kvm/ioapic.c
@@ -209,12 +209,12 @@ static int ioapic_set_irq(struct kvm_ioapic *ioapic, unsigned int irq,
209 209
210 old_irr = ioapic->irr; 210 old_irr = ioapic->irr;
211 ioapic->irr |= mask; 211 ioapic->irr |= mask;
212 if (edge) 212 if (edge) {
213 ioapic->irr_delivered &= ~mask; 213 ioapic->irr_delivered &= ~mask;
214 if ((edge && old_irr == ioapic->irr) || 214 if (old_irr == ioapic->irr) {
215 (!edge && entry.fields.remote_irr)) { 215 ret = 0;
216 ret = 0; 216 goto out;
217 goto out; 217 }
218 } 218 }
219 219
220 ret = ioapic_service(ioapic, irq, line_status); 220 ret = ioapic_service(ioapic, irq, line_status);