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

Commit fd232561 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_mpstate 



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

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

arch/s390/kvm/kvm-s390.c

+9 −2
Original line number Diff line number Diff line
@@ -2833,9 +2833,16 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	int ret;



	vcpu_load(vcpu);



	/* CHECK_STOP and LOAD are not supported yet */

	return is_vcpu_stopped(vcpu) ? KVM_MP_STATE_STOPPED :

	ret = is_vcpu_stopped(vcpu) ? KVM_MP_STATE_STOPPED :

				      KVM_MP_STATE_OPERATING;



	vcpu_put(vcpu);

	return ret;

}



int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,

arch/x86/kvm/x86.c

+3 −0
Original line number Diff line number Diff line
@@ -7465,6 +7465,8 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	vcpu_load(vcpu);



	kvm_apic_accept_events(vcpu);

	if (vcpu->arch.mp_state == KVM_MP_STATE_HALTED &&

					vcpu->arch.pv.pv_unhalted)
@@ -7472,6 +7474,7 @@ int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, 
	else

		mp_state->mp_state = vcpu->arch.mp_state;



	vcpu_put(vcpu);

	return 0;

}

virt/kvm/arm/arm.c

+3 −0
Original line number Diff line number Diff line
@@ -381,11 +381,14 @@ static void vcpu_power_off(struct kvm_vcpu *vcpu) 
int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	vcpu_load(vcpu);



	if (vcpu->arch.power_off)

		mp_state->mp_state = KVM_MP_STATE_STOPPED;

	else

		mp_state->mp_state = KVM_MP_STATE_RUNNABLE;



	vcpu_put(vcpu);

	return 0;

}

virt/kvm/kvm_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2634,9 +2634,7 @@ static long kvm_vcpu_ioctl(struct file *filp, 
	case KVM_GET_MP_STATE: {

		struct kvm_mp_state mp_state;



		vcpu_load(vcpu);

		r = kvm_arch_vcpu_ioctl_get_mpstate(vcpu, &mp_state);

		vcpu_put(vcpu);

		if (r)

			goto out;

		r = -EFAULT;