From patchwork Wed Jul 18 15:07:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 1211661 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 201EEDFFFD for ; Wed, 18 Jul 2012 15:09:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754845Ab2GRPJG (ORCPT ); Wed, 18 Jul 2012 11:09:06 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:56947 "EHLO e06smtp13.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754817Ab2GRPIu (ORCPT ); Wed, 18 Jul 2012 11:08:50 -0400 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 18 Jul 2012 16:08:49 +0100 Received: from d06nrmr1507.portsmouth.uk.ibm.com (9.149.38.233) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 18 Jul 2012 16:08:47 +0100 Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6IF8kCU2130098 for ; Wed, 18 Jul 2012 16:08:46 +0100 Received: from d06av06.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6IF8jnW013723 for ; Wed, 18 Jul 2012 09:08:46 -0600 Received: from localhost (sig-9-145-185-169.de.ibm.com [9.145.185.169]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6IF8iHw013704; Wed, 18 Jul 2012 09:08:45 -0600 From: Stefan Hajnoczi To: Cc: , Anthony Liguori , Kevin Wolf , Paolo Bonzini , "Michael S. Tsirkin" , Asias He , Khoa Huynh , Stefan Hajnoczi Subject: [RFC v9 25/27] msix: fix irqchip breakage in msix_try_notify_from_thread() Date: Wed, 18 Jul 2012 16:07:52 +0100 Message-Id: <1342624074-24650-26-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342624074-24650-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1342624074-24650-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12071815-2966-0000-0000-000004C240FD Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Commit bd8b215bce453706c3951460cc7e6627ccb90314 removed #ifdef KVM_CAP_IRQCHIP from hw/msix.c after it turned out 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 here and hence KVM_CAP_IRQCHIP is not defined. Signed-off-by: Stefan Hajnoczi --- 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; }