| Message ID | 20211223211931.3560887-2-farosas@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | KVM: PPC: KVM module exit fixes | expand |
Excerpts from Fabiano Rosas's message of December 24, 2021 7:19 am: > The return of the function is being shadowed by the call to > kvmppc_uvmem_init. > Reviewed-by: Nicholas Piggin <npiggin@gmail.com> > Fixes: ca9f4942670c ("KVM: PPC: Book3S HV: Support for running secure guests") > Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> > --- > arch/powerpc/kvm/book3s_hv.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index 7b74fc0a986b..9f4765951733 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -6098,8 +6098,11 @@ static int kvmppc_book3s_init_hv(void) > if (r) > return r; > > - if (kvmppc_radix_possible()) > + if (kvmppc_radix_possible()) { > r = kvmppc_radix_init(); > + if (r) > + return r; > + } > > r = kvmppc_uvmem_init(); > if (r < 0) > -- > 2.33.1 > >
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 7b74fc0a986b..9f4765951733 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -6098,8 +6098,11 @@ static int kvmppc_book3s_init_hv(void) if (r) return r; - if (kvmppc_radix_possible()) + if (kvmppc_radix_possible()) { r = kvmppc_radix_init(); + if (r) + return r; + } r = kvmppc_uvmem_init(); if (r < 0)
The return of the function is being shadowed by the call to kvmppc_uvmem_init. Fixes: ca9f4942670c ("KVM: PPC: Book3S HV: Support for running secure guests") Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> --- arch/powerpc/kvm/book3s_hv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)