Re: [PATCH RESEND] KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup

From: Paolo Bonzini
Date: Tue Aug 11 2020 - 07:19:54 EST


On 11/08/20 11:31, Xingxing Su wrote:
> Commit c34b26b98caca48ec9ee9 ("KVM: MIPS: clean up redundant 'kvm_run'
> parameters") remove the 'kvm_run' parameter in kvm_vz_gpsi_lwc2.
>
> The following build error:
>
> arch/mips/kvm/vz.c: In function ‘kvm_trap_vz_handle_gpsi’:
> arch/mips/kvm/vz.c:1243:43: error: ‘run’ undeclared (first use in this function)
> er = kvm_vz_gpsi_lwc2(inst, opc, cause, run, vcpu);
> ^~~
> arch/mips/kvm/vz.c:1243:43: note: each undeclared identifier is reported only
> once for each function it appears in
> scripts/Makefile.build:283: recipe for target 'arch/mips/kvm/vz.o' failed
> make[2]: *** [arch/mips/kvm/vz.o] Error 1
> scripts/Makefile.build:500: recipe for target 'arch/mips/kvm' failed
> make[1]: *** [arch/mips/kvm] Error 2
> Makefile:1785: recipe for target 'arch/mips' failed
> make: *** [arch/mips] Error 2
>
> Signed-off-by: Xingxing Su <suxingxing@xxxxxxxxxxx>
> ---
> +cc Paolo Bonzini <pbonzini@xxxxxxxxxx> and kvm@xxxxxxxxxxxxxxx.
>
> arch/mips/kvm/vz.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/mips/kvm/vz.c b/arch/mips/kvm/vz.c
> index 3932f76..49c6a2a 100644
> --- a/arch/mips/kvm/vz.c
> +++ b/arch/mips/kvm/vz.c
> @@ -1142,7 +1142,6 @@ static enum emulation_result kvm_vz_gpsi_cache(union mips_instruction inst,
> #ifdef CONFIG_CPU_LOONGSON64
> static enum emulation_result kvm_vz_gpsi_lwc2(union mips_instruction inst,
> u32 *opc, u32 cause,
> - struct kvm_run *run,
> struct kvm_vcpu *vcpu)
> {
> unsigned int rs, rd;
> @@ -1240,7 +1239,7 @@ static enum emulation_result kvm_trap_vz_handle_gpsi(u32 cause, u32 *opc,
> #endif
> #ifdef CONFIG_CPU_LOONGSON64
> case lwc2_op:
> - er = kvm_vz_gpsi_lwc2(inst, opc, cause, run, vcpu);
> + er = kvm_vz_gpsi_lwc2(inst, opc, cause, vcpu);
> break;
> #endif
> case spec3_op:
>

Queued, thanks.

Paolo