diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-13 11:40:23 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-13 11:40:23 -0600 |
| commit | 5a58598090d1349d2bd3e9015e6999dcf87ec5b5 (patch) | |
| tree | 1ffd76ba66955a1ac64b6e51800468fd53d93e7e | |
| parent | 45e6cee42b98d10e2e14885ab656541a9ffd5187 (diff) | |
| parent | d281084d3e51f03999d12a506491a0c6f31b40e8 (diff) | |
| download | qemu-5a58598090d1349d2bd3e9015e6999dcf87ec5b5.tar.gz | |
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: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/vfio_pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c index 7c27834e06..fbfe670078 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); } |