On Wed, 2021-10-13 at 12:56 -0400, Paolo Bonzini wrote:
> 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@xxxxxxxxxxxxxxx
> Fixes: 7ed9abfe8e9f ("KVM: SVM: Support string IO operations for an SEV-ES guest")
> Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> ---
> arch/x86/kvm/x86.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 07d9533b471d..ef4d6a0de4d8 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -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)
> {
> + int size = vcpu->arch.pio.size;
> 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);
> + trace_kvm_pio(KVM_PIO_IN, vcpu->arch.pio.port, size,
> + vcpu->arch.pio.count, vcpu->arch.pio_data);
> vcpu->arch.pio.count = 0;
> }
>
> @@ -6950,7 +6951,7 @@ static int emulator_pio_in(struct kvm_vcpu *vcpu, int size,
> return 0;
>
> WARN_ON(count != vcpu->arch.pio.count);
> - complete_emulator_pio_in(vcpu, size, port, val);
> + complete_emulator_pio_in(vcpu, val);
> return 1;
> }
>
Reviewed-by: Maxim Levitsky <mlevitsk@xxxxxxxxxx>
Best regards,
Maxim Levitsky
