Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98001d8d authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: PPC: Add missing vcpu_load()/vcpu_put() in vcpu ioctls 



Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 3dbe1415

arch/powerpc/kvm/book3s.c

+10 −0
Original line number Diff line number Diff line
@@ -1110,6 +1110,8 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
	struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);

	int i;



	vcpu_load(vcpu);



	sregs->pvr = vcpu->arch.pvr;



	sregs->u.s.sdr1 = to_book3s(vcpu)->sdr1;
@@ -1128,6 +1130,9 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
			sregs->u.s.ppc32.dbat[i] = vcpu3s->dbat[i].raw;

		}

	}



	vcpu_put(vcpu);



	return 0;

}
@@ -1137,6 +1142,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 
	struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);

	int i;



	vcpu_load(vcpu);



	kvmppc_set_pvr(vcpu, sregs->pvr);



	vcpu3s->sdr1 = sregs->u.s.sdr1;
@@ -1163,6 +1170,9 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 


	/* Flush the MMU after messing with the segments */

	kvmppc_mmu_pte_flush(vcpu, 0, 0);



	vcpu_put(vcpu);



	return 0;

}

arch/powerpc/kvm/booke.c

+14 −1
Original line number Diff line number Diff line
@@ -485,6 +485,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
{

	int i;



	vcpu_load(vcpu);



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

	regs->cr = kvmppc_get_cr(vcpu);

	regs->ctr = vcpu->arch.ctr;
@@ -505,6 +507,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)

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



	vcpu_put(vcpu);



	return 0;

}
@@ -512,6 +516,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
{

	int i;



	vcpu_load(vcpu);



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

	kvmppc_set_cr(vcpu, regs->cr);

	vcpu->arch.ctr = regs->ctr;
@@ -531,6 +537,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)

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



	vcpu_put(vcpu);



	return 0;

}
@@ -559,7 +567,12 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) 
int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,

                                  struct kvm_translation *tr)

{

	return kvmppc_core_vcpu_translate(vcpu, tr);

	int r;



	vcpu_load(vcpu);

	r = kvmppc_core_vcpu_translate(vcpu, tr);

	vcpu_put(vcpu);

	return r;

}



int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)