On Wed, Jun 08, 2022, Paolo Bonzini wrote:
> Now all callers except emulator_pio_in_emulated are using
> __emulator_pio_in/complete_emulator_pio_in explicitly.
> Move the "either copy the result or attempt PIO" logic in
> emulator_pio_in_emulated, and rename __emulator_pio_in to
> just emulator_pio_in.
Wrap changelogs closer to 75 chars, <60 is a bit too aggressive.
> Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> ---
> arch/x86/kvm/x86.c | 22 ++++++++--------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index aefcc71a7040..fd4382602f65 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -7456,7 +7456,7 @@ static int emulator_pio_in_out(struct kvm_vcpu *vcpu, int size,
> return 0;
> }
>
> -static int __emulator_pio_in(struct kvm_vcpu *vcpu, int size,
> +static int emulator_pio_in(struct kvm_vcpu *vcpu, int size,
> unsigned short port, void *val, unsigned int count)
Align the second line of parameters. Even gets it below 80 columns ;-)
> {
> int r = emulator_pio_in_out(vcpu, size, port, val, count, true);
> @@ -7475,9 +7475,11 @@ static void complete_emulator_pio_in(struct kvm_vcpu *vcpu, void *val)
> vcpu->arch.pio.count = 0;
> }
>
> -static int emulator_pio_in(struct kvm_vcpu *vcpu, int size,
> - unsigned short port, void *val, unsigned int count)
> +static int emulator_pio_in_emulated(struct x86_emulate_ctxt *ctxt,
> + int size, unsigned short port, void *val,
"int size" fits on the first line, emulator_pio_in_emulated() and
emulator_pio_out_emulated() have different formatting either way.
> + unsigned int count)
> {
> + struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
Newline after variable declarations.
> if (vcpu->arch.pio.count) {
> /*
> * Complete a previous iteration that required userspace I/O.
> @@ -7489,18 +7491,10 @@ static int emulator_pio_in(struct kvm_vcpu *vcpu, int size,
> complete_emulator_pio_in(vcpu, val);
> return 1;
> } else {
> - return __emulator_pio_in(vcpu, size, port, val, count);
> + return emulator_pio_in(vcpu, size, port, val, count);
> }
> }
>
> -static int emulator_pio_in_emulated(struct x86_emulate_ctxt *ctxt,
> - int size, unsigned short port, void *val,
> - unsigned int count)
> -{
> - return emulator_pio_in(emul_to_vcpu(ctxt), size, port, val, count);
> -
> -}
> -
> static int emulator_pio_out(struct kvm_vcpu *vcpu, int size,
> unsigned short port, const void *val,
> unsigned int count)
> @@ -8707,7 +8701,7 @@ static int kvm_fast_pio_in(struct kvm_vcpu *vcpu, int size,
> /* For size less than 4 we merge, else we zero extend */
> val = (size < 4) ? kvm_rax_read(vcpu) : 0;
>
> - ret = __emulator_pio_in(vcpu, size, port, &val, 1);
> + ret = emulator_pio_in(vcpu, size, port, &val, 1);
> if (ret) {
> kvm_rax_write(vcpu, val);
> return ret;
> @@ -13078,7 +13072,7 @@ static int kvm_sev_es_ins(struct kvm_vcpu *vcpu, unsigned int size,
> for (;;) {
> unsigned int count =
> min_t(unsigned int, PAGE_SIZE / size, vcpu->arch.sev_pio_count);
> - if (!__emulator_pio_in(vcpu, size, port, vcpu->arch.sev_pio_data, count))
> + if (!emulator_pio_in(vcpu, size, port, vcpu->arch.sev_pio_data, count))
> break;
>
> /* Emulation done by the kernel. */
> --
> 2.31.1
>
>
