From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sheng Yang Subject: [PATCH 2/8] KVM: Use kvm_free_assigned_irq() for free irq Date: Tue, 23 Dec 2008 16:00:25 +0800 Message-ID: <1230019231-16543-3-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 mga02.intel.com ([134.134.136.20]:35086 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753195AbYLWIAl (ORCPT ); Tue, 23 Dec 2008 03:00:41 -0500 In-Reply-To: <1230019231-16543-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: Which is more convenient... Signed-off-by: Sheng Yang --- 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