[PATCH] KVM: Fix assigned device with no irq

Sheng Yang
2009-03-03T07:49:25Z

Some device like VF of SRIOV only support MSI-X.

With this patch, SRIOV can be enabled with KVM assigned device(all kernel space
patches are ready).

Signed-off-by: Sheng Yang <sheng@linux.intel.com>
---
virt/kvm/kvm_main.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 4d2be16..5dc6423 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -308,6 +308,10 @@ static int assigned_device_update_intx(struct kvm *kvm,
if (adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_INTX)
return 0;

+ /* IRQ 0 means uninitialized */
+ if (adev->host_irq == 0)
+ return 0;
+
if (irqchip_in_kernel(kvm)) {
if (!msi2intx &&
(adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI)) {
@@ -529,9 +533,8 @@ static int kvm_vm_ioctl_assign_irq(struct kvm *kvm,
r = 0;
} else {
printk(KERN_WARNING
- "kvm: failed to enable MSI device!\n");
- r = -ENOTTY;
- goto out_release;
+ "kvm: device didn't support INTx or MSI!\n");
+ r = 0;
}
} else {
/* Non-sharing INTx mode */
--
1.5.4.5