From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0Yfc-0005HN-U0 for qemu-devel@nongnu.org; Mon, 15 Dec 2014 11:39:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0YfX-00053W-Bc for qemu-devel@nongnu.org; Mon, 15 Dec 2014 11:38:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53771) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0YfX-00053S-3x for qemu-devel@nongnu.org; Mon, 15 Dec 2014 11:38:47 -0500 From: Paolo Bonzini Date: Mon, 15 Dec 2014 17:37:48 +0100 Message-Id: <1418661511-22348-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1418661511-22348-1-git-send-email-pbonzini@redhat.com> References: <1418661511-22348-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 04/47] vfio: use kvm_resamplefds_enabled() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eric Auger From: Eric Auger Use the kvm_resamplefds_enabled function Signed-off-by: Eric Auger Acked-by: Alex Williamson Signed-off-by: Paolo Bonzini --- 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 fd318a1..a315c3a 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.1