| Message ID | 20230706163610.106938-1-tsbogend@alpha.franken.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3a6dbb691782e88e07e5c70b327495dbd58a2e7f |
| Headers | show |
| Series | MIPS: kvm: Fix build error with KVM_MIPS_DEBUG_COP0_COUNTERS enabled | expand |
On 6/7/23 18:36, Thomas Bogendoerfer wrote: > Commit e4de20576986 ("MIPS: KVM: Fix NULL pointer dereference") missed > converting one place accessing cop0 registers, which results in a build > error, if KVM_MIPS_DEBUG_COP0_COUNTERS is enabled. > > Fixes: e4de20576986 ("MIPS: KVM: Fix NULL pointer dereference") > Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > --- > arch/mips/kvm/stats.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/mips/kvm/stats.c b/arch/mips/kvm/stats.c > index 53f851a61554..3e6682018fbe 100644 > --- a/arch/mips/kvm/stats.c > +++ b/arch/mips/kvm/stats.c > @@ -54,9 +54,9 @@ void kvm_mips_dump_stats(struct kvm_vcpu *vcpu) > kvm_info("\nKVM VCPU[%d] COP0 Access Profile:\n", vcpu->vcpu_id); > for (i = 0; i < N_MIPS_COPROC_REGS; i++) { > for (j = 0; j < N_MIPS_COPROC_SEL; j++) { > - if (vcpu->arch.cop0->stat[i][j]) > + if (vcpu->arch.cop0.stat[i][j]) > kvm_info("%s[%d]: %lu\n", kvm_cop0_str[i], j, > - vcpu->arch.cop0->stat[i][j]); > + vcpu->arch.cop0.stat[i][j]); > } > } > #endif Oops, sorry I missed that :/ Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On Thu, Jul 06, 2023 at 06:36:10PM +0200, Thomas Bogendoerfer wrote: > Commit e4de20576986 ("MIPS: KVM: Fix NULL pointer dereference") missed > converting one place accessing cop0 registers, which results in a build > error, if KVM_MIPS_DEBUG_COP0_COUNTERS is enabled. > > Fixes: e4de20576986 ("MIPS: KVM: Fix NULL pointer dereference") > Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > --- > arch/mips/kvm/stats.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/mips/kvm/stats.c b/arch/mips/kvm/stats.c > index 53f851a61554..3e6682018fbe 100644 > --- a/arch/mips/kvm/stats.c > +++ b/arch/mips/kvm/stats.c > @@ -54,9 +54,9 @@ void kvm_mips_dump_stats(struct kvm_vcpu *vcpu) > kvm_info("\nKVM VCPU[%d] COP0 Access Profile:\n", vcpu->vcpu_id); > for (i = 0; i < N_MIPS_COPROC_REGS; i++) { > for (j = 0; j < N_MIPS_COPROC_SEL; j++) { > - if (vcpu->arch.cop0->stat[i][j]) > + if (vcpu->arch.cop0.stat[i][j]) > kvm_info("%s[%d]: %lu\n", kvm_cop0_str[i], j, > - vcpu->arch.cop0->stat[i][j]); > + vcpu->arch.cop0.stat[i][j]); > } > } > #endif > -- > 2.35.3 applied to mips-next. Thomas.
diff --git a/arch/mips/kvm/stats.c b/arch/mips/kvm/stats.c index 53f851a61554..3e6682018fbe 100644 --- a/arch/mips/kvm/stats.c +++ b/arch/mips/kvm/stats.c @@ -54,9 +54,9 @@ void kvm_mips_dump_stats(struct kvm_vcpu *vcpu) kvm_info("\nKVM VCPU[%d] COP0 Access Profile:\n", vcpu->vcpu_id); for (i = 0; i < N_MIPS_COPROC_REGS; i++) { for (j = 0; j < N_MIPS_COPROC_SEL; j++) { - if (vcpu->arch.cop0->stat[i][j]) + if (vcpu->arch.cop0.stat[i][j]) kvm_info("%s[%d]: %lu\n", kvm_cop0_str[i], j, - vcpu->arch.cop0->stat[i][j]); + vcpu->arch.cop0.stat[i][j]); } } #endif
Commit e4de20576986 ("MIPS: KVM: Fix NULL pointer dereference") missed converting one place accessing cop0 registers, which results in a build error, if KVM_MIPS_DEBUG_COP0_COUNTERS is enabled. Fixes: e4de20576986 ("MIPS: KVM: Fix NULL pointer dereference") Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> --- arch/mips/kvm/stats.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)