diff mbox

[v3,2/2] vfio: use kvm_resamplefds_enabled()

Message ID 1414762699-4700-3-git-send-email-eric.auger@linaro.org
State Superseded
Headers show

Commit Message

Auger Eric Oct. 31, 2014, 1:38 p.m. UTC
Use the kvm_resamplefds_enabled function

Signed-off-by: Eric Auger <eric.auger@linaro.org>
---
 hw/misc/vfio.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Alex Williamson Nov. 4, 2014, 10:25 p.m. UTC | #1
On Fri, 2014-10-31 at 13:38 +0000, Eric Auger wrote:
> Use the kvm_resamplefds_enabled function
> 
> Signed-off-by: Eric Auger <eric.auger@linaro.org>
> ---

If someone wants to pick this up:

Acked-by: Alex Williamson <alex.williamson@redhat.com>

Alternatively, provide an ack on patch 1 and I can bring it in through
my tree after 2.2.  Thanks,

Alex

>  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 b5e7981..75bfa1c 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);
>      }
Paolo Bonzini Nov. 5, 2014, 10:38 a.m. UTC | #2
On 04/11/2014 23:25, Alex Williamson wrote:
> Acked-by: Alex Williamson <alex.williamson@redhat.com>

Thanks, I'll get it into the KVM tree (uq/master).

Paolo
diff mbox

Patch

diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c
index b5e7981..75bfa1c 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);
     }