From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sheng Yang Subject: [PATCH 6/8] KVM: Improve MSI dispatch function Date: Tue, 23 Dec 2008 16:00:29 +0800 Message-ID: <1230019231-16543-7-git-send-email-sheng@linux.intel.com> References: <1230019231-16543-1-git-send-email-sheng@linux.intel.com> Cc: kvm@vger.kernel.org, Sheng Yang To: Avi Kivity Return-path: Received: from mga03.intel.com ([143.182.124.21]:51316 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753104AbYLWIAg (ORCPT ); Tue, 23 Dec 2008 03:00:36 -0500 In-Reply-To: <1230019231-16543-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: Prepare to merge with kvm_set_irq(). Signed-off-by: Sheng Yang --- 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 50b3ff6..49848cb 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -87,13 +87,13 @@ 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; struct kvm_ioapic *ioapic = ioapic_irqchip(dev->kvm); struct kvm_gsi_msg *gsi_msg = - kvm_find_gsi_msg(dev->kvm, dev->guest_irq); + kvm_find_gsi_msg(dev->kvm, gsi); int dest_id, vector, dest_mode, trig_mode, delivery_mode; u32 deliver_bitmask; @@ -141,7 +141,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, @@ -176,7 +176,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