Skip to contentSkip to conversation

MIPS: KVM: Fix build error caused by 'kvm_run' cleanup

PATCH Applied Huacai Chen 3 participants 3 messages Jul 19, 2020 – Jul 27, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MIPS: KVM: Fix build error caused by 'kvm_run' cleanup

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")
Cc Tianjia Zhang <[email protected]>

---
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(-)
arch/mips/kvm/emulate.c +1 -1
index d242300c..3b3f7b11 100644
@@ -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;
 	}
Signature · 1 line
2.7.0
#1 lore raw
Quoted 11 lines · 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")
Cc Tianjia Zhang <[email protected]>

---
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

Quoted 17 lines
  arch/mips/kvm/emulate.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kvm/emulate.c +1 -1
index d242300c..3b3f7b11 100644
@@ -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;
  	}
maintainer Applied
#2 lore raw
In reply to Huacai Chen
Quoted 21 lines · 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")
Cc Tianjia Zhang <[email protected]>

---
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(-)
arch/mips/kvm/emulate.c +0 -0
index d242300c..3b3f7b11 100644

arch/mips/kvm/emulate.c enum emulation_result kvm_mips_emulate_load(union mips_instruction inst, · line 2134

Quoted 8 lines
arch/mips/kvm/emulate.c +1 -1
@@ -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