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

Commit 7a42fdc2 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: remove __cpu_is_stopped and expose is_vcpu_stopped 



The function "__cpu_is_stopped" is not used any more. Let's remove it and
expose the function "is_vcpu_stopped" instead, which is actually what we want.

This patch also converts an open coded check for CPUSTAT_STOPPED to
is_vcpu_stopped().

Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 32f5ff63

arch/s390/kvm/kvm-s390.c

+1 −6
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ static int kvm_arch_vcpu_ioctl_set_initial_psw(struct kvm_vcpu *vcpu, psw_t psw) 
{

	int rc = 0;



	if (!(atomic_read(&vcpu->arch.sie_block->cpuflags) & CPUSTAT_STOPPED))

	if (!is_vcpu_stopped(vcpu))

		rc = -EBUSY;

	else {

		vcpu->run->psw_mask = psw.mask;
@@ -1413,11 +1413,6 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr) 
	return kvm_s390_store_status_unloaded(vcpu, addr);

}



static inline int is_vcpu_stopped(struct kvm_vcpu *vcpu)

{

	return atomic_read(&(vcpu)->arch.sie_block->cpuflags) & CPUSTAT_STOPPED;

}



static void __disable_ibs_on_vcpu(struct kvm_vcpu *vcpu)

{

	kvm_check_request(KVM_REQ_ENABLE_IBS, vcpu);

arch/s390/kvm/kvm-s390.h

+2 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ do { \ 
	  d_args); \

} while (0)



static inline int __cpu_is_stopped(struct kvm_vcpu *vcpu)

static inline int is_vcpu_stopped(struct kvm_vcpu *vcpu)

{

	return atomic_read(&vcpu->arch.sie_block->cpuflags) & CPUSTAT_STOP_INT;

	return atomic_read(&vcpu->arch.sie_block->cpuflags) & CPUSTAT_STOPPED;

}



static inline int kvm_is_ucontrol(struct kvm *kvm)