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

Commit 875656fe authored by Christoffer Dall's avatar Christoffer Dall Committed by Paolo Bonzini
Browse files

KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_regs 



Move vcpu_load() and vcpu_put() into the architecture specific
implementations of kvm_arch_vcpu_ioctl_set_regs().

Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1fc9b76b

arch/mips/kvm/mips.c

+3 −0
Original line number Diff line number Diff line
@@ -1148,6 +1148,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
{

	int i;



	vcpu_load(vcpu);



	for (i = 1; i < ARRAY_SIZE(vcpu->arch.gprs); i++)

		vcpu->arch.gprs[i] = regs->gpr[i];

	vcpu->arch.gprs[0] = 0; /* zero is special, and cannot be set. */
@@ -1155,6 +1157,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	vcpu->arch.lo = regs->lo;

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



	vcpu_put(vcpu);

	return 0;

}

arch/powerpc/kvm/book3s.c

+3 −0
Original line number Diff line number Diff line
@@ -528,6 +528,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
{

	int i;



	vcpu_load(vcpu);



	kvmppc_set_pc(vcpu, regs->pc);

	kvmppc_set_cr(vcpu, regs->cr);

	kvmppc_set_ctr(vcpu, regs->ctr);
@@ -548,6 +550,7 @@ 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;

}

arch/powerpc/kvm/booke.c

+3 −0
Original line number Diff line number Diff line
@@ -1462,6 +1462,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;
@@ -1483,6 +1485,7 @@ 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;

}

arch/s390/kvm/kvm-s390.c

+2 −0
Original line number Diff line number Diff line
@@ -2709,7 +2709,9 @@ static int kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) 


int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)

{

	vcpu_load(vcpu);

	memcpy(&vcpu->run->s.regs.gprs, &regs->gprs, sizeof(regs->gprs));

	vcpu_put(vcpu);

	return 0;

}

arch/x86/kvm/x86.c

+3 −0
Original line number Diff line number Diff line
@@ -7375,6 +7375,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 


int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)

{

	vcpu_load(vcpu);



	vcpu->arch.emulate_regs_need_sync_from_vcpu = true;

	vcpu->arch.emulate_regs_need_sync_to_vcpu = false;
@@ -7404,6 +7406,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 


	kvm_make_request(KVM_REQ_EVENT, vcpu);



	vcpu_put(vcpu);

	return 0;

}