[PATCH 06/15] KVM: Improve MSI dispatch function

[Sheng Yang]

Prepare to merge with kvm_set_irq().

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

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 3494861..599257e 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -87,7 +87,7 @@ static bool kvm_rebooting;
 #ifdef KVM_CAP_DEVICE_ASSIGNMENT
 
 #ifdef CONFIG_X86
-static void assigned_device_msi_dispatch(struct kvm_assigned_dev_kernel *dev)
+static void assigned_device_msi_dispatch(struct kvm_assigned_dev_kernel *dev, 
u32 gsi)
 {
        int vcpu_id;
        struct kvm_vcpu *vcpu;
@@ -99,7 +99,7 @@ static void assigned_device_msi_dispatch(struct 
kvm_assigned_dev_kernel *dev)
        BUG_ON(!ioapic);
 
        mutex_lock(&dev->kvm->gsi_msg_lock);
-       gsi_msg = kvm_find_gsi_msg(dev->kvm, dev->guest_irq);
+       gsi_msg = kvm_find_gsi_msg(dev->kvm, gsi);
        if (!gsi_msg) {
                printk(KERN_WARNING "kvm: fail to find correlated gsi_msg\n");
                return;
@@ -143,7 +143,7 @@ static void assigned_device_msi_dispatch(struct 
kvm_assigned_dev_kernel *dev)
        }
 }
 #else
-static void assigned_device_msi_dispatch(struct kvm_assigned_dev_kernel *dev) 
{}
+static void assigned_device_msi_dispatch(struct kvm_assigned_dev_kernel *dev, 
u32 gsi) {}
 #endif
 
 static struct kvm_assigned_dev_kernel *kvm_find_assigned_dev(struct list_head 
*head,
@@ -178,7 +178,7 @@ static void kvm_assigned_dev_interrupt_work_handler(struct 
work_struct *work)
                            assigned_dev->guest_irq, 1);
        else if (assigned_dev->irq_requested_type &
                                KVM_ASSIGNED_DEV_GUEST_MSI) {
-               assigned_device_msi_dispatch(assigned_dev);
+               assigned_device_msi_dispatch(assigned_dev, 
assigned_dev->guest_irq);
                enable_irq(assigned_dev->host_irq);
                assigned_dev->host_irq_disabled = false;
        }
-- 
1.5.4.5

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html