Commit bc9c1933 authored by Peter Tyser's avatar Peter Tyser Committed by Marcelo Tosatti
Browse files

KVM: PPC: Fix SPRG get/set for Book3S and BookE 



Previously SPRGs 4-7 were improperly read and written in
kvm_arch_vcpu_ioctl_get_regs() and kvm_arch_vcpu_ioctl_set_regs();

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarPeter Tyser <ptyser@xes-inc.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 775077a0

arch/powerpc/kvm/book3s.c

+8 −6
Original line number Diff line number Diff line
@@ -1141,9 +1141,10 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	regs->sprg1 = vcpu->arch.shared->sprg1;

	regs->sprg2 = vcpu->arch.shared->sprg2;

	regs->sprg3 = vcpu->arch.shared->sprg3;

	regs->sprg5 = vcpu->arch.sprg4;

	regs->sprg6 = vcpu->arch.sprg5;

	regs->sprg7 = vcpu->arch.sprg6;

	regs->sprg4 = vcpu->arch.sprg4;

	regs->sprg5 = vcpu->arch.sprg5;

	regs->sprg6 = vcpu->arch.sprg6;

	regs->sprg7 = vcpu->arch.sprg7;



	for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)

		regs->gpr[i] = kvmppc_get_gpr(vcpu, i);
@@ -1167,9 +1168,10 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	vcpu->arch.shared->sprg1 = regs->sprg1;

	vcpu->arch.shared->sprg2 = regs->sprg2;

	vcpu->arch.shared->sprg3 = regs->sprg3;

	vcpu->arch.sprg5 = regs->sprg4;

	vcpu->arch.sprg6 = regs->sprg5;

	vcpu->arch.sprg7 = regs->sprg6;

	vcpu->arch.sprg4 = regs->sprg4;

	vcpu->arch.sprg5 = regs->sprg5;

	vcpu->arch.sprg6 = regs->sprg6;

	vcpu->arch.sprg7 = regs->sprg7;



	for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)

		kvmppc_set_gpr(vcpu, i, regs->gpr[i]);

arch/powerpc/kvm/booke.c

+8 −6
Original line number Diff line number Diff line
@@ -546,9 +546,10 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	regs->sprg1 = vcpu->arch.shared->sprg1;

	regs->sprg2 = vcpu->arch.shared->sprg2;

	regs->sprg3 = vcpu->arch.shared->sprg3;

	regs->sprg5 = vcpu->arch.sprg4;

	regs->sprg6 = vcpu->arch.sprg5;

	regs->sprg7 = vcpu->arch.sprg6;

	regs->sprg4 = vcpu->arch.sprg4;

	regs->sprg5 = vcpu->arch.sprg5;

	regs->sprg6 = vcpu->arch.sprg6;

	regs->sprg7 = vcpu->arch.sprg7;



	for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)

		regs->gpr[i] = kvmppc_get_gpr(vcpu, i);
@@ -572,9 +573,10 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	vcpu->arch.shared->sprg1 = regs->sprg1;

	vcpu->arch.shared->sprg2 = regs->sprg2;

	vcpu->arch.shared->sprg3 = regs->sprg3;

	vcpu->arch.sprg5 = regs->sprg4;

	vcpu->arch.sprg6 = regs->sprg5;

	vcpu->arch.sprg7 = regs->sprg6;

	vcpu->arch.sprg4 = regs->sprg4;

	vcpu->arch.sprg5 = regs->sprg5;

	vcpu->arch.sprg6 = regs->sprg6;

	vcpu->arch.sprg7 = regs->sprg7;



	for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)

		kvmppc_set_gpr(vcpu, i, regs->gpr[i]);