On Tue, Jan 21, 2020 at 12:05:00PM +0100, Paolo Bonzini wrote: > On 20/01/20 05:04, Paul Mackerras wrote: > > On Wed, Dec 18, 2019 at 01:54:57PM -0800, Sean Christopherson wrote: > >> Move allocation of all flavors of PPC vCPUs to common PPC code. All > >> variants either allocate 'struct kvm_vcpu' directly, or require that > >> the embedded 'struct kvm_vcpu' member be located at offset 0, i.e. > >> guarantee that the allocation can be directly interpreted as a 'struct > >> kvm_vcpu' object. > >> > >> Remove the message from the build-time assertion regarding placement of > >> the struct, as compatibility with the arch usercopy region is no longer > >> the sole dependent on 'struct kvm_vcpu' being at offset zero. > >> > >> Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> > > > > This fails to compile for Book E configs: > > > > CC arch/powerpc/kvm/e500.o > > /home/paulus/kernel/kvm/arch/powerpc/kvm/e500.c: In function ‘kvmppc_core_vcpu_create_e500’: > > /home/paulus/kernel/kvm/arch/powerpc/kvm/e500.c:464:9: error: return makes integer from pointer without a cast [-Werror=int-conversion] > > return vcpu; > > ^ > > cc1: all warnings being treated as errors > > make[3]: *** [/home/paulus/kernel/kvm/scripts/Makefile.build:266: arch/powerpc/kvm/e500.o] Error 1 > > > > There is a "return vcpu" statement in kvmppc_core_vcpu_create_e500(), > > and another in kvmppc_core_vcpu_create_e500mc(), which both need to be > > changed to "return 0". > > > > (By the way, I do appreciate you fixing the PPC code, even if there > > are some errors.) > > Squashed: Thanks for cleaning up after me, not having to rebase and resend this series made my day :-) > diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c > index 96d9cde3d2e3..f5dd2c7adcd4 100644 > --- a/arch/powerpc/kvm/e500.c > +++ b/arch/powerpc/kvm/e500.c > @@ -461,7 +461,7 @@ static int kvmppc_core_vcpu_create_e500(struct kvm *kvm, struct kvm_vcpu *vcpu, > goto uninit_tlb; > } > > - return vcpu; > + return 0; > > uninit_tlb: > kvmppc_e500_tlb_uninit(vcpu_e500); > diff --git a/arch/powerpc/kvm/e500mc.c b/arch/powerpc/kvm/e500mc.c > index aea588f73bf7..7c0d392f667a 100644 > --- a/arch/powerpc/kvm/e500mc.c > +++ b/arch/powerpc/kvm/e500mc.c > @@ -327,7 +327,7 @@ static int kvmppc_core_vcpu_create_e500mc(struct kvm *kvm, struct kvm_vcpu *vcpu > goto uninit_tlb; > } > > - return vcpu; > + return 0; > > uninit_tlb: > kvmppc_e500_tlb_uninit(vcpu_e500); > >
