]> git.baikalelectronics.ru Git - kernel.git/commit
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)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 6 Aug 2014 12:24:47 +0000 (14:24 +0200)
commit42384016590dd1f3376a3a5ee85b5c8faf82c1e5
tree40ef78afecdc7775b1507f862d18604f20ada399
parente5ad7bb7f355cd80e58340e649df0b58e819c81b
KVM: Move more code under CONFIG_HAVE_KVM_IRQFD

Commits 106cb0466822 (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 93dcef9fc51e (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>
include/linux/kvm_host.h
include/trace/events/kvm.h
virt/kvm/eventfd.c
virt/kvm/kvm_main.c