From: Alex Williamson Date: Mon, 10 Dec 2012 18:30:03 +0000 (-0700) Subject: vfio-pci: Don't use kvm_irqchip_in_kernel X-Git-Tag: qemu-xen-4.3.0~6^2~23 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=37e1428cc7968675a3fbb4048e869c8080023f5a;p=qemu-upstream-4.3-testing.git 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 Cc: qemu-stable@nongnu.org (cherry picked from commit d281084d3e51f03999d12a506491a0c6f31b40e8) Signed-off-by: Michael Roth --- diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c index 7c27834e0..fbfe67007 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); }