aboutsummaryrefslogtreecommitdiff
path: root/virt
diff options
context:
space:
mode:
authorSheng Yang <sheng@linux.intel.com>2009-01-06 16:25:10 +0800
committerAvi Kivity <avi@redhat.com>2009-02-15 02:47:38 +0200
commitd7cff1c37664971aae32bb0de82231ed34933d8e (patch)
tree6f4359fe37b73624aafae456dd1ed354c4ea4923 /virt
parent2aaf69dcee864f4fb6402638dd2f263324ac839f (diff)
downloadlinux-linaro-stable-d7cff1c37664971aae32bb0de82231ed34933d8e.tar.gz
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>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 277ea7f39fc8..d9bbb20f230f 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);
}