Happy new year !
On Wed, 16 Dec 2015 18:24:03 +0100
Greg Kurz <gk...@linux.vnet.ibm.com> wrote:
> The get and set operations got exchanged by mistake when moving the
> code from book3s.c to powerpc.c.
>
> Fixes: 3840edc8033ad5b86deee309c1c321ca54257452
> Signed-off-by: Greg Kurz <gk...@linux.vnet.ibm.com>
> ---
>
Ping ?
> It's been there for over a year but I guess we want that in 4.4, even
> if doesn't break the host kernel.
>
> arch/powerpc/kvm/powerpc.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
> index 6fd2405c7f4a..a3b182dcb823 100644
> --- a/arch/powerpc/kvm/powerpc.c
> +++ b/arch/powerpc/kvm/powerpc.c
> @@ -919,21 +919,17 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu,
> struct kvm_one_reg *reg)
> r = -ENXIO;
> break;
> }
> - vcpu->arch.vr.vr[reg->id - KVM_REG_PPC_VR0] = val.vval;
> + val.vval = vcpu->arch.vr.vr[reg->id - KVM_REG_PPC_VR0];
> break;
> case KVM_REG_PPC_VSCR:
> if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {
> r = -ENXIO;
> break;
> }
> - vcpu->arch.vr.vscr.u[3] = set_reg_val(reg->id, val);
> + val = get_reg_val(reg->id, vcpu->arch.vr.vscr.u[3]);
> break;
> case KVM_REG_PPC_VRSAVE:
> - if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {
> - r = -ENXIO;
> - break;
> - }
> - vcpu->arch.vrsave = set_reg_val(reg->id, val);
> + val = get_reg_val(reg->id, vcpu->arch.vrsave);
> break;
> #endif /* CONFIG_ALTIVEC */
> default:
> @@ -974,17 +970,21 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu,
> struct kvm_one_reg *reg)
> r = -ENXIO;
> break;
> }
> - val.vval = vcpu->arch.vr.vr[reg->id - KVM_REG_PPC_VR0];
> + vcpu->arch.vr.vr[reg->id - KVM_REG_PPC_VR0] = val.vval;
> break;
> case KVM_REG_PPC_VSCR:
> if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {
> r = -ENXIO;
> break;
> }
> - val = get_reg_val(reg->id, vcpu->arch.vr.vscr.u[3]);
> + vcpu->arch.vr.vscr.u[3] = set_reg_val(reg->id, val);
> break;
> case KVM_REG_PPC_VRSAVE:
> - val = get_reg_val(reg->id, vcpu->arch.vrsave);
> + if (!cpu_has_feature(CPU_FTR_ALTIVEC)) {
> + r = -ENXIO;
> + break;
> + }
> + vcpu->arch.vrsave = set_reg_val(reg->id, val);
> break;
> #endif /* CONFIG_ALTIVEC */
> default:
>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
