kvm_check_extension() explodes when KVM isn't enabled so we need to
first test whether KVM is enabled. Use kvm_irqchip_in_kernel() for
this since it matches the test we do before using this result.
Signed-off-by: Alex Williamson <alex.williamson@xxxxxxxxxx>
---
hw/vfio_pci.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Anthony, please include this for 1.3. Let me know if you prefer a
pull request. Thanks,
Alex
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index 7c27834..2acc757 100644
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -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_irqchip_in_kernel() &&
+ kvm_check_extension(kvm_state, KVM_CAP_IRQFD_RESAMPLE)) {
vdev->intx.route = pci_device_route_intx_to_irq(&vdev->pdev,
vdev->intx.pin);
}
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
