KVM: Move more code under CONFIG_HAVE_KVM_IRQFD
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 6 Aug 2014 12:24:45 +0000 (14:24 +0200)
committerChristoffer Dall <christoffer.dall@linaro.org>
Thu, 2 Oct 2014 15:19:10 +0000 (17:19 +0200)
commit57f984d2c64c8c1e597d021567a379f4f3920b35
tree9fc949148661605afafeb9ebd67cd27a64981608
parentf65b953a7232ae8bb497b226363629f9e49b4792
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>
(cherry picked from commit c77dcacb397519b6ade8f08201a4a90a7f4f751e)
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
include/linux/kvm_host.h
include/trace/events/kvm.h
virt/kvm/eventfd.c
virt/kvm/kvm_main.c