From patchwork Fri Nov 30 19:50:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 203032 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A26E22C0097 for ; Sat, 1 Dec 2012 06:51:06 +1100 (EST) Received: from localhost ([::1]:52588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeWc4-00066j-Ci for incoming@patchwork.ozlabs.org; Fri, 30 Nov 2012 14:51:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44795) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeWbv-00066Q-H8 for qemu-devel@nongnu.org; Fri, 30 Nov 2012 14:50:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TeWbr-00036Q-TA for qemu-devel@nongnu.org; Fri, 30 Nov 2012 14:50:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:30444) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeWbr-000367-Ka for qemu-devel@nongnu.org; Fri, 30 Nov 2012 14:50:51 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAUJooaa015877 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 30 Nov 2012 14:50:50 -0500 Received: from bling.home (ovpn-113-71.phx2.redhat.com [10.3.113.71]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAUJongx018176; Fri, 30 Nov 2012 14:50:49 -0500 To: aliguori@us.ibm.com From: Alex Williamson Date: Fri, 30 Nov 2012 12:50:49 -0700 Message-ID: <20121130195006.4188.4903.stgit@bling.home> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [for-1.3 PATCH v2] vfio-pci: Don't use kvm_irqchip_in_kernel X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org kvm_irqchip_in_kernel() has an architecture specific meaning, so we shouldn't be using it to determine whether to enabled KVM INTx bypass. kvm_irqfds_enabled() seems most appropriate. Also use this to protect our other call to kvm_check_extension() as that explodes when KVM isn't enabled. Post 1.3 we might think about adding a kvm_intx_via_irqfd_enabled() helper. Signed-off-by: Alex Williamson --- Anthony, please include for 1.3. Thanks. hw/vfio_pci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c index 7c27834..fbfe670 100644 --- a/hw/vfio_pci.c +++ b/hw/vfio_pci.c @@ -275,7 +275,7 @@ static void vfio_enable_intx_kvm(VFIODevice *vdev) int ret, argsz; int32_t *pfd; - if (!kvm_irqchip_in_kernel() || + if (!kvm_irqfds_enabled() || vdev->intx.route.mode != PCI_INTX_ENABLED || !kvm_check_extension(kvm_state, KVM_CAP_IRQFD_RESAMPLE)) { return; @@ -438,7 +438,8 @@ static int vfio_enable_intx(VFIODevice *vdev) * Only conditional to avoid generating error messages on platforms * where we won't actually use the result anyway. */ - if (kvm_check_extension(kvm_state, KVM_CAP_IRQFD_RESAMPLE)) { + if (kvm_irqfds_enabled() && + kvm_check_extension(kvm_state, KVM_CAP_IRQFD_RESAMPLE)) { vdev->intx.route = pci_device_route_intx_to_irq(&vdev->pdev, vdev->intx.pin); }