Re: [PATCH] KVM: PPC: e500: Don't hardcode PIR=0

Alexander Graf
2011-09-02T15:12:45Z

Am 02.09.2011 um 01:08 schrieb Scott Wood <scottwood@freescale.com>:

> Signed-off-by: Scott Wood <scottwood@freescale.com>

Patch description missing.

Also, since pir == vcpu_id now, can't we just remove pir?

Alex

> ---
> arch/powerpc/kvm/booke.c | 4 ++--
> arch/powerpc/kvm/e500.c | 3 ---
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
> index ee45fa0..d967faf 100644
> --- a/arch/powerpc/kvm/booke.c
> +++ b/arch/powerpc/kvm/booke.c
> @@ -753,7 +753,7 @@ static void get_sregs_arch206(struct kvm_vcpu *vcpu,
> {
> sregs->u.e.features |= KVM_SREGS_E_ARCH206;
>
> - sregs->u.e.pir = 0;
> + sregs->u.e.pir = vcpu->vcpu_id;
> sregs->u.e.mcsrr0 = vcpu->arch.mcsrr0;
> sregs->u.e.mcsrr1 = vcpu->arch.mcsrr1;
> sregs->u.e.decar = vcpu->arch.decar;
> @@ -766,7 +766,7 @@ static int set_sregs_arch206(struct kvm_vcpu *vcpu,
> if (!(sregs->u.e.features & KVM_SREGS_E_ARCH206))
> return 0;
>
> - if (sregs->u.e.pir != 0)
> + if (sregs->u.e.pir != vcpu->vcpu_id)
> return -EINVAL;
>
> vcpu->arch.mcsrr0 = sregs->u.e.mcsrr0;
> diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
> index b8f065c..e8f5ec2 100644
> --- a/arch/powerpc/kvm/e500.c
> +++ b/arch/powerpc/kvm/e500.c
> @@ -70,9 +70,6 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu)
> vcpu->arch.pvr = mfspr(SPRN_PVR);
> vcpu_e500->svr = mfspr(SPRN_SVR);
>
> - /* Since booke kvm only support one core, update all vcpus' PIR to 0 */
> - vcpu->vcpu_id = 0;
> -
> return 0;
> }
>
> --
> 1.7.6
>