Re: [PATCH 7/8] KVM: SEV-ES: keep INS functions together

Maxim Levitsky
2021-10-21T23:14:59Z

On Wed, 2021-10-13 at 12:56 -0400, Paolo Bonzini wrote:
> Make the diff a little nicer when we actually get to fixing
> the bug. No functional change intended.
>
> Cc: stable@vger.kernel.org
> Fixes: 7ed9abfe8e9f ("KVM: SVM: Support string IO operations for an SEV-ES guest")
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> arch/x86/kvm/x86.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index ef4d6a0de4d8..a485e185ad00 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -12377,15 +12377,6 @@ int kvm_sev_es_mmio_read(struct kvm_vcpu *vcpu, gpa_t gpa, unsigned int bytes,
> }
> EXPORT_SYMBOL_GPL(kvm_sev_es_mmio_read);
>
> -static int complete_sev_es_emulated_ins(struct kvm_vcpu *vcpu)
> -{
> - memcpy(vcpu->arch.sev_pio_data, vcpu->arch.pio_data,
> - vcpu->arch.pio.count * vcpu->arch.pio.size);
> - vcpu->arch.pio.count = 0;
> -
> - return 1;
> -}
> -
> static int kvm_sev_es_outs(struct kvm_vcpu *vcpu, unsigned int size,
> unsigned int port, unsigned int count)
> {
> @@ -12401,6 +12392,15 @@ static int kvm_sev_es_outs(struct kvm_vcpu *vcpu, unsigned int size,
> return 0;
> }
>
> +static int complete_sev_es_emulated_ins(struct kvm_vcpu *vcpu)
> +{
> + memcpy(vcpu->arch.sev_pio_data, vcpu->arch.pio_data,
> + vcpu->arch.pio.count * vcpu->arch.pio.size);
> + vcpu->arch.pio.count = 0;
> +
> + return 1;
> +}
> +
> static int kvm_sev_es_ins(struct kvm_vcpu *vcpu, unsigned int size,
> unsigned int port, unsigned int count)
> {
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Best regards,
Maxim Levitsky