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

Commit 34c33d16 authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

KVM: Drop unused evaluations from string pio handlers 



Looks like neither the direction nor the rep prefix are used anymore.
Drop related evaluations from SVM's and VMX's I/O exit handlers.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 1b2fd70c

arch/x86/kvm/svm.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1194,7 +1194,7 @@ static int shutdown_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) 
static int io_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)

static int io_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)

{

{

	u32 io_info = svm->vmcb->control.exit_info_1; /* address size bug? */

	u32 io_info = svm->vmcb->control.exit_info_1; /* address size bug? */

	int size, down, in, string, rep;

	int size, in, string;

	unsigned port;

	unsigned port;





	++svm->vcpu.stat.io_exits;

	++svm->vcpu.stat.io_exits;
@@ -1213,8 +1213,6 @@ static int io_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) 
	in = (io_info & SVM_IOIO_TYPE_MASK) != 0;

	in = (io_info & SVM_IOIO_TYPE_MASK) != 0;

	port = io_info >> 16;

	port = io_info >> 16;

	size = (io_info & SVM_IOIO_SIZE_MASK) >> SVM_IOIO_SIZE_SHIFT;

	size = (io_info & SVM_IOIO_SIZE_MASK) >> SVM_IOIO_SIZE_SHIFT;

	rep = (io_info & SVM_IOIO_REP_MASK) != 0;

	down = (svm->vmcb->save.rflags & X86_EFLAGS_DF) != 0;





	skip_emulated_instruction(&svm->vcpu);

	skip_emulated_instruction(&svm->vcpu);

	return kvm_emulate_pio(&svm->vcpu, kvm_run, in, size, port);

	return kvm_emulate_pio(&svm->vcpu, kvm_run, in, size, port);

arch/x86/kvm/vmx.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -2698,7 +2698,7 @@ static int handle_triple_fault(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
static int handle_io(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

static int handle_io(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

{

{

	unsigned long exit_qualification;

	unsigned long exit_qualification;

	int size, down, in, string, rep;

	int size, in, string;

	unsigned port;

	unsigned port;





	++vcpu->stat.io_exits;

	++vcpu->stat.io_exits;
@@ -2714,8 +2714,6 @@ static int handle_io(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 




	size = (exit_qualification & 7) + 1;

	size = (exit_qualification & 7) + 1;

	in = (exit_qualification & 8) != 0;

	in = (exit_qualification & 8) != 0;

	down = (vmcs_readl(GUEST_RFLAGS) & X86_EFLAGS_DF) != 0;

	rep = (exit_qualification & 32) != 0;

	port = exit_qualification >> 16;

	port = exit_qualification >> 16;





	skip_emulated_instruction(vcpu);

	skip_emulated_instruction(vcpu);