Patchwork [RFC,v9,25/27] msix: fix irqchip breakage in msix_try_notify_from_thread()

login
register
mail settings
Submitter Stefan Hajnoczi
Date July 18, 2012, 3:07 p.m.
Message ID <1342624074-24650-26-git-send-email-stefanha@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/171731/
State New
Headers show

Comments

Stefan Hajnoczi - July 18, 2012, 3:07 p.m.
Commit bd8b215bce453706c3951460cc7e6627ccb90314 removed #ifdef
KVM_CAP_IRQCHIP from hw/msix.c after it turned out <linux/kvm.h> is not
included since msix.o is built in libhw64/.  Do the same for
msix_try_notify_from_thread() since we do not have access to
<linux/kvm.h> here and hence KVM_CAP_IRQCHIP is not defined.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/msix.c |    2 --
 1 file changed, 2 deletions(-)

Patch

diff --git a/hw/msix.c b/hw/msix.c
index 3308604..0ed1013 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -511,12 +511,10 @@  bool msix_try_notify_from_thread(PCIDevice *dev, unsigned vector)
     if (unlikely(msix_is_masked(dev, vector))) {
         return false;
     }
-#ifdef KVM_CAP_IRQCHIP
     if (likely(kvm_enabled() && kvm_irqchip_in_kernel())) {
         kvm_set_irq(dev->msix_irq_entries[vector].gsi, 1, NULL);
         return true;
     }
-#endif
     return false;
 }