KVM: fix assigned_device_enable_host_msix error handling

Free IRQ's and disable MSIX upon failure. Cc: Avi Kivity <[email protected]> Signed-off-by: Jing Zhang <[email protected]> Signed-off-by: Marcelo Tosatti <[email protected]>
mgowda · May 17, 2010 · d57e2c0 · d57e2c0
1 parent a87fa35
commit d57e2c0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c
@@ -316,12 +316,16 @@ static int assigned_device_enable_host_msix(struct kvm *kvm,
 				kvm_assigned_dev_intr, 0,
 				"kvm_assigned_msix_device",
 				(void *)dev);
-		/* FIXME: free requested_irq's on failure */
 		if (r)
-			return r;
+			goto err;
 	}
 
 	return 0;
+err:
+	for (i -= 1; i >= 0; i--)
+		free_irq(dev->host_msix_entries[i].vector, (void *)dev);
+	pci_disable_msix(dev->dev);
+	return r;
 }
 
 #endif