All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] KVM: MIPS: Fix a build error for !CPU_LOONGSON64
@ 2020-06-15  6:56 Huacai Chen
  2020-06-15  9:26 ` Paolo Bonzini
  0 siblings, 1 reply; 2+ messages in thread
From: Huacai Chen @ 2020-06-15  6:56 UTC (permalink / raw)
  To: Paolo Bonzini, Thomas Bogendoerfer, Aleksandar Markovic
  Cc: kvm, linux-mips, Fuxin Zhang, Huacai Chen, Jiaxun Yang, Huacai Chen

During the KVM merging progress, a CONFIG_CPU_LOONGSON64 guard in commit
7f2a83f1c2a941ebfee53 ("KVM: MIPS: Add CPUCFG emulation for Loongson-3")
is missing by accident. So add it to avoid building error.

Fixes: 7f2a83f1c2a941ebfee53 ("KVM: MIPS: Add CPUCFG emulation for Loongson-3")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
 arch/mips/kvm/mips.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index 521bd58..666d335 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -67,8 +67,10 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
 	VCPU_STAT("vz_ghfc", vz_ghfc_exits),
 	VCPU_STAT("vz_gpa", vz_gpa_exits),
 	VCPU_STAT("vz_resvd", vz_resvd_exits),
+#ifdef CONFIG_CPU_LOONGSON64
 	VCPU_STAT("vz_cpucfg", vz_cpucfg_exits),
 #endif
+#endif
 	VCPU_STAT("halt_successful_poll", halt_successful_poll),
 	VCPU_STAT("halt_attempted_poll", halt_attempted_poll),
 	VCPU_STAT("halt_poll_invalid", halt_poll_invalid),
-- 
2.7.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] KVM: MIPS: Fix a build error for !CPU_LOONGSON64
  2020-06-15  6:56 [PATCH] KVM: MIPS: Fix a build error for !CPU_LOONGSON64 Huacai Chen
@ 2020-06-15  9:26 ` Paolo Bonzini
  0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2020-06-15  9:26 UTC (permalink / raw)
  To: Huacai Chen, Thomas Bogendoerfer, Aleksandar Markovic
  Cc: kvm, linux-mips, Fuxin Zhang, Huacai Chen, Jiaxun Yang

On 15/06/20 08:56, Huacai Chen wrote:
> During the KVM merging progress, a CONFIG_CPU_LOONGSON64 guard in commit
> 7f2a83f1c2a941ebfee53 ("KVM: MIPS: Add CPUCFG emulation for Loongson-3")
> is missing by accident. So add it to avoid building error.
> 
> Fixes: 7f2a83f1c2a941ebfee53 ("KVM: MIPS: Add CPUCFG emulation for Loongson-3")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> ---
>  arch/mips/kvm/mips.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
> index 521bd58..666d335 100644
> --- a/arch/mips/kvm/mips.c
> +++ b/arch/mips/kvm/mips.c
> @@ -67,8 +67,10 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
>  	VCPU_STAT("vz_ghfc", vz_ghfc_exits),
>  	VCPU_STAT("vz_gpa", vz_gpa_exits),
>  	VCPU_STAT("vz_resvd", vz_resvd_exits),
> +#ifdef CONFIG_CPU_LOONGSON64
>  	VCPU_STAT("vz_cpucfg", vz_cpucfg_exits),
>  #endif
> +#endif
>  	VCPU_STAT("halt_successful_poll", halt_successful_poll),
>  	VCPU_STAT("halt_attempted_poll", halt_attempted_poll),
>  	VCPU_STAT("halt_poll_invalid", halt_poll_invalid),
> 


Queued, thanks.

Paolo


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-06-15  9:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-15  6:56 [PATCH] KVM: MIPS: Fix a build error for !CPU_LOONGSON64 Huacai Chen
2020-06-15  9:26 ` Paolo Bonzini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.