From patchwork Wed Jul 18 15:07:52 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [RFC, v9,
 25/27] msix: fix irqchip breakage in msix_try_notify_from_thread()
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
X-Patchwork-Id: 171731
Message-Id: <1342624074-24650-26-git-send-email-stefanha@linux.vnet.ibm.com>
To: <qemu-devel@nongnu.org>
Cc: Kevin Wolf <kwolf@redhat.com>, Anthony Liguori <aliguori@us.ibm.com>,
 Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>,
 kvm@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>,
 Khoa Huynh <khoa@us.ibm.com>,
 Paolo Bonzini <pbonzini@redhat.com>, Asias He <asias@redhat.com>
Date: Wed, 18 Jul 2012 16:07:52 +0100

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(-)

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;
 }