KVM: SEV-ES: rename guest_ins_data to sev_pio_data

We will be using this field for OUTS emulation as well, in case the
data that is pushed via OUTS spans more than one page.  In that case,
there will be a need to save the data pointer across exits to userspace.

So, change the name to something that refers to any kind of PIO.
Also spell out what it is used for, namely SEV-ES.

No functional change intended.

Cc: stable@vger.kernel.org
Fixes: 7ed9abfe8e9f ("KVM: SVM: Support string IO operations for an SEV-ES guest")
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index f8f48a7ec577f64d2af855f58e0467768f091ccc..6bed6c416c6c350745d0b4d78b161cc1c1368742 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -702,7 +702,7 @@ struct kvm_vcpu_arch {
 
        struct kvm_pio_request pio;
        void *pio_data;
-       void *guest_ins_data;
+       void *sev_pio_data;
 
        u8 event_exit_inst_len;
 

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 381384a5479069d3f5915e3a3d28c0b0dd88395b..379175b725a13a9da7998c9f2fda7f96824120cc 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -12370,7 +12370,7 @@ EXPORT_SYMBOL_GPL(kvm_sev_es_mmio_read);
 
 static int complete_sev_es_emulated_ins(struct kvm_vcpu *vcpu)
 {
-       memcpy(vcpu->arch.guest_ins_data, vcpu->arch.pio_data,
+       memcpy(vcpu->arch.sev_pio_data, vcpu->arch.pio_data,
               vcpu->arch.pio.count * vcpu->arch.pio.size);
        vcpu->arch.pio.count = 0;
 
@@ -12402,7 +12402,7 @@ static int kvm_sev_es_ins(struct kvm_vcpu *vcpu, unsigned int size,
        if (ret) {
                vcpu->arch.pio.count = 0;
        } else {
-               vcpu->arch.guest_ins_data = data;
+               vcpu->arch.sev_pio_data = data;
                vcpu->arch.complete_userspace_io = complete_sev_es_emulated_ins;
        }