Commit 5a585980 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

qMerge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-20121210.0' into staging 



vfio-pci: fix kvm disabled path

* awilliam/tags/vfio-pci-for-qemu-20121210.0:
  vfio-pci: Don't use kvm_irqchip_in_kernel

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 45e6cee4 d281084d

hw/vfio_pci.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

    }