[PATCH v3 2/4] KVM: PPC: Book3S HV: Delay setting of kvm ops

[Fabiano Rosas]

Delay the setting of kvm_hv_ops until after all init code has
completed. This avoids leaving the ops still accessible if the init
fails.

Signed-off-by: Fabiano Rosas <faro...@linux.ibm.com>
---
 arch/powerpc/kvm/book3s_hv.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 3a3845f366d4..b9aace212599 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -6127,9 +6127,6 @@ static int kvmppc_book3s_init_hv(void)
        }
 #endif
 
-       kvm_ops_hv.owner = THIS_MODULE;
-       kvmppc_hv_ops = &kvm_ops_hv;
-
        init_default_hcalls();
 
        init_vcore_lists();
@@ -6145,10 +6142,15 @@ static int kvmppc_book3s_init_hv(void)
        }
 
        r = kvmppc_uvmem_init();
-       if (r < 0)
+       if (r < 0) {
                pr_err("KVM-HV: kvmppc_uvmem_init failed %d\n", r);
+               return r;
+       }
 
-       return r;
+       kvm_ops_hv.owner = THIS_MODULE;
+       kvmppc_hv_ops = &kvm_ops_hv;
+
+       return 0;
 }
 
 static void kvmppc_book3s_exit_hv(void)
-- 
2.34.1