Commit 7a6177d6 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: complete fast IN directly with complete_emulator_pio_in() 



Use complete_emulator_pio_in() directly when completing fast PIO, there's
no need to bounce through emulator_pio_in(): the comment about ECX
changing doesn't apply to fast PIO, which isn't used for string I/O.

No functional change intended.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 091abbf5

arch/x86/kvm/x86.c

+1 −5
Original line number Diff line number Diff line
@@ -8871,11 +8871,7 @@ static int complete_fast_pio_in(struct kvm_vcpu *vcpu) 
	/* For size less than 4 we merge, else we zero extend */

	val = (vcpu->arch.pio.size < 4) ? kvm_rax_read(vcpu) : 0;



	/*

	 * Since vcpu->arch.pio.count == 1 let emulator_pio_in perform

	 * the copy and tracing

	 */

	emulator_pio_in(vcpu, vcpu->arch.pio.size, vcpu->arch.pio.port, &val, 1);

	complete_emulator_pio_in(vcpu, &val);

	kvm_rax_write(vcpu, val);



	return kvm_skip_emulated_instruction(vcpu);