Commit 6b5efc93 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: remove unnecessary arguments from complete_emulator_pio_in 



complete_emulator_pio_in can expect that vcpu->arch.pio has been filled in,
and therefore does not need the size and count arguments.  This makes things
nicer when the function is called directly from a complete_userspace_io
callback.

No functional change intended.

Cc: stable@vger.kernel.org
Fixes: 7ed9abfe ("KVM: SVM: Support string IO operations for an SEV-ES guest")
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3b27de27

arch/x86/kvm/x86.c

+6 −5
Original line number Diff line number Diff line
@@ -6935,11 +6935,12 @@ static int __emulator_pio_in(struct kvm_vcpu *vcpu, int size, 
	return emulator_pio_in_out(vcpu, size, port, count, true);

}



static void complete_emulator_pio_in(struct kvm_vcpu *vcpu, int size,

				    unsigned short port, void *val)

static void complete_emulator_pio_in(struct kvm_vcpu *vcpu, void *val)

{

	memcpy(val, vcpu->arch.pio_data, size * vcpu->arch.pio.count);

	trace_kvm_pio(KVM_PIO_IN, port, size, vcpu->arch.pio.count, vcpu->arch.pio_data);

	int size = vcpu->arch.pio.size;

	unsigned count = vcpu->arch.pio.count;

	memcpy(val, vcpu->arch.pio_data, size * count);

	trace_kvm_pio(KVM_PIO_IN, vcpu->arch.pio.port, size, count, vcpu->arch.pio_data);

	vcpu->arch.pio.count = 0;

}
@@ -6957,7 +6958,7 @@ static int emulator_pio_in(struct kvm_vcpu *vcpu, int size, 
	}



	WARN_ON(count != vcpu->arch.pio.count);

	complete_emulator_pio_in(vcpu, size, port, val);

	complete_emulator_pio_in(vcpu, val);

	return 1;

}