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

Commit 1fc9b76b 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_get_regs 



Move vcpu_load() and vcpu_put() into the architecture specific
implementations of kvm_arch_vcpu_ioctl_get_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 accb757d

arch/mips/kvm/mips.c

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

	int i;



	vcpu_load(vcpu);



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

		regs->gpr[i] = vcpu->arch.gprs[i];
@@ -1169,6 +1171,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	regs->lo = vcpu->arch.lo;

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



	vcpu_put(vcpu);

	return 0;

}

arch/powerpc/kvm/book3s.c

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

	int i;



	vcpu_load(vcpu);



	regs->pc = kvmppc_get_pc(vcpu);

	regs->cr = kvmppc_get_cr(vcpu);

	regs->ctr = kvmppc_get_ctr(vcpu);
@@ -518,6 +520,7 @@ 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;

}

arch/powerpc/kvm/booke.c

+3 −0
Original line number Diff line number Diff line
@@ -1431,6 +1431,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;
@@ -1452,6 +1454,7 @@ 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;

}

arch/s390/kvm/kvm-s390.c

+2 −0
Original line number Diff line number Diff line
@@ -2715,7 +2715,9 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 


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

{

	vcpu_load(vcpu);

	memcpy(&regs->gprs, &vcpu->run->s.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
@@ -7334,6 +7334,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 


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

{

	vcpu_load(vcpu);



	if (vcpu->arch.emulate_regs_need_sync_to_vcpu) {

		/*

		 * We are here if userspace calls get_regs() in the middle of
@@ -7367,6 +7369,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	regs->rip = kvm_rip_read(vcpu);

	regs->rflags = kvm_get_rflags(vcpu);



	vcpu_put(vcpu);

	return 0;

}