falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vfio-pci: Don't use kvm_irqchip_in_kernel 

kvm_irqchip_in_kernel() has an architecture specific meaning, so
we shouldn't be using it to determine whether to enabled KVM INTx
bypass.  kvm_irqfds_enabled() seems most appropriate.  Also use this
to protect our other call to kvm_check_extension() as that explodes
when KVM isn't enabled.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Cc: qemu-stable@nongnu.org
(cherry picked from commit d281084d3e)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Alex Williamson 2012-12-10 11:30:03 -07:00 committed by Michael Roth
parent 518799a3e7
commit 37e1428cc7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/vfio_pci.c
View File

@ -275,7 +275,7 @@ static void vfio_enable_intx_kvm(VFIODevice *vdev)
int ret, argsz; int ret, argsz;
int32_t *pfd; int32_t *pfd;
if (!kvm_irqchip_in_kernel() || if (!kvm_irqfds_enabled() ||
vdev->intx.route.mode != PCI_INTX_ENABLED || vdev->intx.route.mode != PCI_INTX_ENABLED ||
!kvm_check_extension(kvm_state, KVM_CAP_IRQFD_RESAMPLE)) { !kvm_check_extension(kvm_state, KVM_CAP_IRQFD_RESAMPLE)) {
return; return;
@ -438,7 +438,8 @@ static int vfio_enable_intx(VFIODevice *vdev)
* Only conditional to avoid generating error messages on platforms * Only conditional to avoid generating error messages on platforms
* where we won't actually use the result anyway. * 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.route = pci_device_route_intx_to_irq(&vdev->pdev,
vdev->intx.pin); vdev->intx.pin);
} }