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

Commit 6b948a72 authored by Thomas Huth's avatar Thomas Huth Committed by Paolo Bonzini
Browse files

KVM: s390: Remove dead "rerun vcpu" code 



The need for SIE_INTERCEPT_RERUNVCPU has been removed long ago already,
with the following commit:
	f7850c92
	[S390] remove kvm mmu reload on s390
Since the remainders are dead code, they are now removed by this patch.

Signed-off-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 56aba608

arch/s390/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ struct kvm_s390_interrupt_info { 
/* for local_interrupt.action_flags */

#define ACTION_STORE_ON_STOP		(1<<0)

#define ACTION_STOP_ON_STOP		(1<<1)

#define ACTION_RELOADVCPU_ON_STOP	(1<<2)



struct kvm_s390_local_interrupt {

	spinlock_t lock;

arch/s390/kvm/intercept.c

+0 −6
Original line number Diff line number Diff line
@@ -62,12 +62,6 @@ static int handle_stop(struct kvm_vcpu *vcpu) 


	trace_kvm_s390_stop_request(vcpu->arch.local_int.action_bits);



	if (vcpu->arch.local_int.action_bits & ACTION_RELOADVCPU_ON_STOP) {

		vcpu->arch.local_int.action_bits &= ~ACTION_RELOADVCPU_ON_STOP;

		rc = SIE_INTERCEPT_RERUNVCPU;

		vcpu->run->exit_reason = KVM_EXIT_INTR;

	}



	if (vcpu->arch.local_int.action_bits & ACTION_STOP_ON_STOP) {

		atomic_set_mask(CPUSTAT_STOPPED,

				&vcpu->arch.sie_block->cpuflags);

arch/s390/kvm/kvm-s390.c

+0 −4
Original line number Diff line number Diff line
@@ -749,7 +749,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	int rc;

	sigset_t sigsaved;



rerun_vcpu:

	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
@@ -793,9 +792,6 @@ rerun_vcpu: 
			rc = kvm_handle_sie_intercept(vcpu);

	} while (!signal_pending(current) && !rc);



	if (rc == SIE_INTERCEPT_RERUNVCPU)

		goto rerun_vcpu;



	if (signal_pending(current) && !rc) {

		kvm_run->exit_reason = KVM_EXIT_INTR;

		rc = -EINTR;

arch/s390/kvm/kvm-s390.h

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ typedef int (*intercept_handler_t)(struct kvm_vcpu *vcpu); 
extern unsigned long *vfacilities;



/* negativ values are error codes, positive values for internal conditions */

#define SIE_INTERCEPT_RERUNVCPU		(1<<0)

#define SIE_INTERCEPT_UCONTROL		(1<<1)

#define SIE_INTERCEPT_UCONTROL		(1<<0)

int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu);



#define VM_EVENT(d_kvm, d_loglevel, d_string, d_args...)\