diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-06 14:24:45 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-06 14:24:47 +0200 |
| commit | c77dcacb397519b6ade8f08201a4a90a7f4f751e (patch) | |
| tree | 40ef78afecdc7775b1507f862d18604f20ada399 /virt/kvm/kvm_main.c | |
| parent | 56cc2406d68c0f09505c389e276f27a99f495cbd (diff) | |
| download | op-kernel-dev-c77dcacb397519b6ade8f08201a4a90a7f4f751e.zip op-kernel-dev-c77dcacb397519b6ade8f08201a4a90a7f4f751e.tar.gz | |
KVM: Move more code under CONFIG_HAVE_KVM_IRQFD
Commits e4d57e1ee1ab (KVM: Move irq notifier implementation into
eventfd.c, 2014-06-30) included the irq notifier code unconditionally
in eventfd.c, while it was under CONFIG_HAVE_KVM_IRQCHIP before.
Similarly, commit 297e21053a52 (KVM: Give IRQFD its own separate enabling
Kconfig option, 2014-06-30) moved code from CONFIG_HAVE_IRQ_ROUTING
to CONFIG_HAVE_KVM_IRQFD but forgot to move the pieces that used to be
under CONFIG_HAVE_KVM_IRQCHIP.
Together, this broke compilation without CONFIG_KVM_XICS. Fix by adding
or changing the #ifdefs so that they point at CONFIG_HAVE_KVM_IRQFD.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt/kvm/kvm_main.c')
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a69a623..33712fb 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -465,6 +465,8 @@ static struct kvm *kvm_create_vm(unsigned long type) #ifdef CONFIG_HAVE_KVM_IRQCHIP INIT_HLIST_HEAD(&kvm->mask_notifier_list); +#endif +#ifdef CONFIG_HAVE_KVM_IRQFD INIT_HLIST_HEAD(&kvm->irq_ack_notifier_list); #endif |
