[PATCH 2/8] KVM: Use kvm_free_assigned_irq() for free irq

[Sheng Yang]

Which is more convenient...

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

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index ffd261d..cd84b3e 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -284,11 +284,7 @@ static int assigned_device_update_intx(struct kvm *kvm,
                return 0;
 
        if (irqchip_in_kernel(kvm)) {
-               if (!msi2intx &&
-                   adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI) {
-                       free_irq(adev->host_irq, (void *)kvm);
-                       pci_disable_msi(adev->dev);
-               }
+               kvm_free_assigned_irq(kvm, adev);
 
                if (!capable(CAP_SYS_RAWIO))
                        return -EPERM;
@@ -339,9 +335,7 @@ static int assigned_device_update_msi(struct kvm *kvm,
 
        if (irqchip_in_kernel(kvm)) {
                if (!msi2intx) {
-                       if (adev->irq_requested_type &
-                                       KVM_ASSIGNED_DEV_HOST_INTX)
-                               free_irq(adev->host_irq, (void *)adev);
+                       kvm_free_assigned_irq(kvm, adev);
 
                        r = pci_enable_msi(adev->dev);
                        if (r)
-- 
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