MIPS: KVM: Fix build error caused by 'kvm_run' cleanup
diff mbox series

Message ID 1595154207-9787-1-git-send-email-chenhc@lemote.com
State Mainlined
Commit 033555f6eb60787bd40e34d7abeacaebdcd4c54e
Headers show
Series
  • MIPS: KVM: Fix build error caused by 'kvm_run' cleanup
Related show

Commit Message

Huacai Chen July 19, 2020, 10:23 a.m. UTC
Commit c34b26b98caca48ec9ee9 ("KVM: MIPS: clean up redundant 'kvm_run'
parameters") remove the 'kvm_run' parameter in kvm_mips_complete_mmio_
load(), but forget to update all callers.

Fixes: c34b26b98caca48ec9ee9 ("KVM: MIPS: clean up redundant 'kvm_run' parameters")
Reported-by: kernel test robot <lkp@intel.com>
Cc: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
I have reviewed Tianjia's patch but hadn't found the bug, I'm very very
sorry for that.

 arch/mips/kvm/emulate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jiaxun Yang July 19, 2020, 10:44 a.m. UTC | #1
在 2020/7/19 下午6:23, Huacai Chen 写道:
> Commit c34b26b98caca48ec9ee9 ("KVM: MIPS: clean up redundant 'kvm_run'
> parameters") remove the 'kvm_run' parameter in kvm_mips_complete_mmio_
> load(), but forget to update all callers.
>
> Fixes: c34b26b98caca48ec9ee9 ("KVM: MIPS: clean up redundant 'kvm_run' parameters")
> Reported-by: kernel test robot <lkp@intel.com>
> Cc: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> ---
> I have reviewed Tianjia's patch but hadn't found the bug, I'm very very
> sorry for that.


Oops, I suspected it as my local merge conflict at my initial test.

Sorry for the inconvinence.

- Jiaxun

>
>   arch/mips/kvm/emulate.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
> index d242300c..3b3f7b11 100644
> --- a/arch/mips/kvm/emulate.c
> +++ b/arch/mips/kvm/emulate.c
> @@ -2128,7 +2128,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst,
>   			run->mmio.phys_addr, run->mmio.len, run->mmio.data);
>   
>   	if (!r) {
> -		kvm_mips_complete_mmio_load(vcpu, run);
> +		kvm_mips_complete_mmio_load(vcpu);
>   		vcpu->mmio_needed = 0;
>   		return EMULATE_DONE;
>   	}
Paolo Bonzini July 27, 2020, 1:53 p.m. UTC | #2
On 19/07/20 12:23, Huacai Chen wrote:
> Commit c34b26b98caca48ec9ee9 ("KVM: MIPS: clean up redundant 'kvm_run'
> parameters") remove the 'kvm_run' parameter in kvm_mips_complete_mmio_
> load(), but forget to update all callers.
> 
> Fixes: c34b26b98caca48ec9ee9 ("KVM: MIPS: clean up redundant 'kvm_run' parameters")
> Reported-by: kernel test robot <lkp@intel.com>
> Cc: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> ---
> I have reviewed Tianjia's patch but hadn't found the bug, I'm very very
> sorry for that.
> 
>  arch/mips/kvm/emulate.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
> index d242300c..3b3f7b11 100644
> --- a/arch/mips/kvm/emulate.c
> +++ b/arch/mips/kvm/emulate.c
> @@ -2128,7 +2128,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst,
>  			run->mmio.phys_addr, run->mmio.len, run->mmio.data);
>  
>  	if (!r) {
> -		kvm_mips_complete_mmio_load(vcpu, run);
> +		kvm_mips_complete_mmio_load(vcpu);
>  		vcpu->mmio_needed = 0;
>  		return EMULATE_DONE;
>  	}
> 

Queued, thanks.

Paolo

Patch
diff mbox series

diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index d242300c..3b3f7b11 100644
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -2128,7 +2128,7 @@  enum emulation_result kvm_mips_emulate_load(union mips_instruction inst,
 			run->mmio.phys_addr, run->mmio.len, run->mmio.data);
 
 	if (!r) {
-		kvm_mips_complete_mmio_load(vcpu, run);
+		kvm_mips_complete_mmio_load(vcpu);
 		vcpu->mmio_needed = 0;
 		return EMULATE_DONE;
 	}