From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP7HC-0007OU-1H for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:54:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XP7H5-0007ro-UA for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:54:53 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:55103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP7H5-0007qC-J8 for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:54:47 -0400 Received: by mail-wi0-f170.google.com with SMTP id cc10so5552845wib.1 for ; Wed, 03 Sep 2014 02:54:43 -0700 (PDT) From: Eric Auger Date: Wed, 3 Sep 2014 10:54:10 +0100 Message-Id: <1409738050-3810-3-git-send-email-eric.auger@linaro.org> In-Reply-To: <1409738050-3810-1-git-send-email-eric.auger@linaro.org> References: <1409738050-3810-1-git-send-email-eric.auger@linaro.org> Subject: [Qemu-devel] [PATCH v2 2/2] vfio: use kvm_resamplefds_enabled() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, a.rigo@virtualopensystems.com, agraf@suse.de, aik@ozlabs.ru, bsd@redhat.com, pbonzini@redhat.com, peter.maydell@linaro.org, mtosatti@redhat.com, borntraeger@de.ibm.com, cornelia.huck@de.ibm.com, rth@twiddle.net, thuth@linux.vnet.ibm.com, afaerber@suse.de, qemu-ppc@nongnu.org Cc: alex.williamson@redhat.com, patches@linaro.org, kvmarm@lists.cs.columbia.edu, eric.auger@linaro.org Use the kvm_resamplefds_enabled function Signed-off-by: Eric Auger --- hw/misc/vfio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index 40dcaa6..24f6a3a 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -406,7 +406,7 @@ static void vfio_enable_intx_kvm(VFIODevice *vdev) if (!VFIO_ALLOW_KVM_INTX || !kvm_irqfds_enabled() || vdev->intx.route.mode != PCI_INTX_ENABLED || - !kvm_check_extension(kvm_state, KVM_CAP_IRQFD_RESAMPLE)) { + !kvm_resamplefds_enabled()) { return; } @@ -568,8 +568,7 @@ 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_irqfds_enabled() && - kvm_check_extension(kvm_state, KVM_CAP_IRQFD_RESAMPLE)) { + if (kvm_irqfds_enabled() && kvm_resamplefds_enabled()) { vdev->intx.route = pci_device_route_intx_to_irq(&vdev->pdev, vdev->intx.pin); } -- 1.8.3.2