Small change that will be needed when we use set_virt_disable_func() on kvm_arch_init(). Signed-off-by: Eduardo Habkost <ehabkost at redhat.com> --- arch/x86/kvm/x86.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 38f79b6..ff895e2 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2603,19 +2603,22 @@ int kvm_arch_init(void *opaque) goto out; } + kvm_x86_ops = ops; + r = kvm_mmu_module_init(); if (r) - goto out; + goto out_clear_ops; kvm_init_msr_list(); - kvm_x86_ops = ops; kvm_mmu_set_nonpresent_ptes(0ull, 0ull); kvm_mmu_set_base_ptes(PT_PRESENT_MASK); kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK, PT_DIRTY_MASK, PT64_NX_MASK, 0, 0); return 0; +out_clear_ops: + kvm_x86_ops = NULL; out: return r; } -- 1.5.5.GIT
