lkml.org 
[lkml]   [2010]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/40] KVM: Remove ifdefs from mmu notifier initialization
    Date
    Signed-off-by: Avi Kivity <avi@redhat.com>
    ---
    virt/kvm/kvm_main.c | 20 +++++++++++++++-----
    1 files changed, 15 insertions(+), 5 deletions(-)

    diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
    index 92f5c98..c10d117 100644
    --- a/virt/kvm/kvm_main.c
    +++ b/virt/kvm/kvm_main.c
    @@ -341,6 +341,20 @@ static const struct mmu_notifier_ops kvm_mmu_notifier_ops = {
    .change_pte = kvm_mmu_notifier_change_pte,
    .release = kvm_mmu_notifier_release,
    };
    +
    +static int kvm_init_mmu_notifier(struct kvm *kvm)
    +{
    + kvm->mmu_notifier.ops = &kvm_mmu_notifier_ops;
    + return mmu_notifier_register(&kvm->mmu_notifier, current->mm);
    +}
    +
    +#else /* !(CONFIG_MMU_NOTIFIER && KVM_ARCH_WANT_MMU_NOTIFIER) */
    +
    +static int kvm_init_mmu_notifier(struct kvm *kvm)
    +{
    + return 0;
    +}
    +
    #endif /* CONFIG_MMU_NOTIFIER && KVM_ARCH_WANT_MMU_NOTIFIER */

    static struct kvm *kvm_create_vm(void)
    @@ -373,11 +387,7 @@ static struct kvm *kvm_create_vm(void)
    (struct kvm_coalesced_mmio_ring *)page_address(page);
    #endif

    -#if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER)
    - kvm->mmu_notifier.ops = &kvm_mmu_notifier_ops;
    - r = mmu_notifier_register(&kvm->mmu_notifier, current->mm);
    -#endif
    -
    + r = kvm_init_mmu_notifier(kvm);
    if (r) {
    #ifdef KVM_COALESCED_MMIO_PAGE_OFFSET
    put_page(page);
    --
    1.6.5.3


    \
     
     \ /
      Last update: 2010-02-10 18:33    [W:0.022 / U:42.332 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site