Commit f35cee4a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: de-underscorify __emulator_pio_in 



Now all callers except emulator_pio_in_emulated are using
__emulator_pio_in/complete_emulator_pio_in explicitly.
Move the "either copy the result or attempt PIO" logic in
emulator_pio_in_emulated, and rename __emulator_pio_in to
just emulator_pio_in.

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

arch/x86/kvm/x86.c

+9 −15
Original line number Diff line number Diff line
@@ -7626,7 +7626,7 @@ static int emulator_pio_in_out(struct kvm_vcpu *vcpu, int size, 
	return 0;

}



static int __emulator_pio_in(struct kvm_vcpu *vcpu, int size,

static int emulator_pio_in(struct kvm_vcpu *vcpu, int size,

      			   unsigned short port, void *val, unsigned int count)

{

	int r = emulator_pio_in_out(vcpu, size, port, val, count, true);
@@ -7645,9 +7645,11 @@ static void complete_emulator_pio_in(struct kvm_vcpu *vcpu, void *val) 
	vcpu->arch.pio.count = 0;

}



static int emulator_pio_in(struct kvm_vcpu *vcpu, int size,

			   unsigned short port, void *val, unsigned int count)

static int emulator_pio_in_emulated(struct x86_emulate_ctxt *ctxt,

				    int size, unsigned short port, void *val,

				    unsigned int count)

{

	struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);

	if (vcpu->arch.pio.count) {

		/*

		 * Complete a previous iteration that required userspace I/O.
@@ -7660,15 +7662,7 @@ static int emulator_pio_in(struct kvm_vcpu *vcpu, int size, 
		return 1;

	}



	return __emulator_pio_in(vcpu, size, port, val, count);

}



static int emulator_pio_in_emulated(struct x86_emulate_ctxt *ctxt,

				    int size, unsigned short port, void *val,

				    unsigned int count)

{

	return emulator_pio_in(emul_to_vcpu(ctxt), size, port, val, count);



	return emulator_pio_in(vcpu, size, port, val, count);

}



static int emulator_pio_out(struct kvm_vcpu *vcpu, int size,
@@ -8886,7 +8880,7 @@ static int kvm_fast_pio_in(struct kvm_vcpu *vcpu, int size, 
	/* For size less than 4 we merge, else we zero extend */

	val = (size < 4) ? kvm_rax_read(vcpu) : 0;



	ret = __emulator_pio_in(vcpu, size, port, &val, 1);

	ret = emulator_pio_in(vcpu, size, port, &val, 1);

	if (ret) {

		kvm_rax_write(vcpu, val);

		return ret;
@@ -13277,7 +13271,7 @@ static int kvm_sev_es_ins(struct kvm_vcpu *vcpu, unsigned int size, 
	for (;;) {

		unsigned int count =

			min_t(unsigned int, PAGE_SIZE / size, vcpu->arch.sev_pio_count);

		if (!__emulator_pio_in(vcpu, size, port, vcpu->arch.sev_pio_data, count))

		if (!emulator_pio_in(vcpu, size, port, vcpu->arch.sev_pio_data, count))

			break;



		/* Emulation done by the kernel.  */