From: Sheng Yang <sheng@linux.intel.com>
Date: Tue, 6 Jan 2009 08:25:10 +0000 (+0800)
Subject: KVM: Fix INTx for device assignment
X-Git-Tag: v2.6.29-rc6~90^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d7cff1c37664971aae32bb0de82231ed34933d8e;p=~emulex%2Finfiniband.git

KVM: Fix INTx for device assignment

Missing buckets and wrong parameter for free_irq()

Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 277ea7f39fc..d9bbb20f230 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -296,8 +296,8 @@ static int assigned_device_update_intx(struct kvm *kvm,
 
 	if (irqchip_in_kernel(kvm)) {
 		if (!msi2intx &&
-		    adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI) {
-			free_irq(adev->host_irq, (void *)kvm);
+		    (adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI)) {
+			free_irq(adev->host_irq, (void *)adev);
 			pci_disable_msi(adev->dev);
 		}