Commit 4fa4b38d authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: SEV-ES: keep INS functions together 



Make the diff a little nicer when we actually get to fixing
the bug.  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 6b5efc93

arch/x86/kvm/x86.c

+9 −9
Original line number Diff line number Diff line
@@ -12385,15 +12385,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)

{
@@ -12409,6 +12400,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)

{