diff options
author | Gleb Natapov <gleb@redhat.com> | 2009-08-24 04:54:23 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-12-03 02:32:07 -0500 |
commit | 136bdfeee7b5bc986fc94af3a40d7d13ea37bb95 (patch) | |
tree | 8f054eab63663dd0a55084d1a397079c73774664 /virt | |
parent | e42bba90bfe724e32fc66ab1b6cb283c51d064b1 (diff) |
KVM: Move irq ack notifier list to arch independent code
Mask irq notifier list is already there.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/irq_comm.c | 5 | ||||
-rw-r--r-- | virt/kvm/kvm_main.c | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c index fb861dd956fc..f01972595938 100644 --- a/virt/kvm/irq_comm.c +++ b/virt/kvm/irq_comm.c | |||
@@ -186,8 +186,7 @@ void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin) | |||
186 | rcu_read_unlock(); | 186 | rcu_read_unlock(); |
187 | 187 | ||
188 | if (gsi != -1) | 188 | if (gsi != -1) |
189 | hlist_for_each_entry(kian, n, &kvm->arch.irq_ack_notifier_list, | 189 | hlist_for_each_entry(kian, n, &kvm->irq_ack_notifier_list, link) |
190 | link) | ||
191 | if (kian->gsi == gsi) | 190 | if (kian->gsi == gsi) |
192 | kian->irq_acked(kian); | 191 | kian->irq_acked(kian); |
193 | } | 192 | } |
@@ -196,7 +195,7 @@ void kvm_register_irq_ack_notifier(struct kvm *kvm, | |||
196 | struct kvm_irq_ack_notifier *kian) | 195 | struct kvm_irq_ack_notifier *kian) |
197 | { | 196 | { |
198 | mutex_lock(&kvm->irq_lock); | 197 | mutex_lock(&kvm->irq_lock); |
199 | hlist_add_head(&kian->link, &kvm->arch.irq_ack_notifier_list); | 198 | hlist_add_head(&kian->link, &kvm->irq_ack_notifier_list); |
200 | mutex_unlock(&kvm->irq_lock); | 199 | mutex_unlock(&kvm->irq_lock); |
201 | } | 200 | } |
202 | 201 | ||
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 3bee94892774..6eca153e1a02 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -958,6 +958,7 @@ static struct kvm *kvm_create_vm(void) | |||
958 | goto out; | 958 | goto out; |
959 | #ifdef CONFIG_HAVE_KVM_IRQCHIP | 959 | #ifdef CONFIG_HAVE_KVM_IRQCHIP |
960 | INIT_HLIST_HEAD(&kvm->mask_notifier_list); | 960 | INIT_HLIST_HEAD(&kvm->mask_notifier_list); |
961 | INIT_HLIST_HEAD(&kvm->irq_ack_notifier_list); | ||
961 | #endif | 962 | #endif |
962 | 963 | ||
963 | #ifdef KVM_COALESCED_MMIO_PAGE_OFFSET | 964 | #ifdef KVM_COALESCED_MMIO_PAGE_OFFSET |