Skip to content

Commit 4fa4b38

Browse files
committed
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: [email protected] Fixes: 7ed9abf ("KVM: SVM: Support string IO operations for an SEV-ES guest") Reviewed-by: Maxim Levitsky <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 6b5efc9 commit 4fa4b38

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

arch/x86/kvm/x86.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12385,15 +12385,6 @@ int kvm_sev_es_mmio_read(struct kvm_vcpu *vcpu, gpa_t gpa, unsigned int bytes,
1238512385
}
1238612386
EXPORT_SYMBOL_GPL(kvm_sev_es_mmio_read);
1238712387

12388-
static int complete_sev_es_emulated_ins(struct kvm_vcpu *vcpu)
12389-
{
12390-
memcpy(vcpu->arch.sev_pio_data, vcpu->arch.pio_data,
12391-
vcpu->arch.pio.count * vcpu->arch.pio.size);
12392-
vcpu->arch.pio.count = 0;
12393-
12394-
return 1;
12395-
}
12396-
1239712388
static int kvm_sev_es_outs(struct kvm_vcpu *vcpu, unsigned int size,
1239812389
unsigned int port, unsigned int count)
1239912390
{
@@ -12409,6 +12400,15 @@ static int kvm_sev_es_outs(struct kvm_vcpu *vcpu, unsigned int size,
1240912400
return 0;
1241012401
}
1241112402

12403+
static int complete_sev_es_emulated_ins(struct kvm_vcpu *vcpu)
12404+
{
12405+
memcpy(vcpu->arch.sev_pio_data, vcpu->arch.pio_data,
12406+
vcpu->arch.pio.count * vcpu->arch.pio.size);
12407+
vcpu->arch.pio.count = 0;
12408+
12409+
return 1;
12410+
}
12411+
1241212412
static int kvm_sev_es_ins(struct kvm_vcpu *vcpu, unsigned int size,
1241312413
unsigned int port, unsigned int count)
1241412414
{

0 commit comments

Comments
 (0)