kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] KVM: nVMX: allow compiling with W=1
@ 2020-02-28  2:49 Valdis Klētnieks
  2020-02-28  9:36 ` Paolo Bonzini
  0 siblings, 1 reply; 2+ messages in thread
From: Valdis Klētnieks @ 2020-02-28  2:49 UTC (permalink / raw)
  To: Paolo Bonzini, Thomas Gleixner, Ingo Molnar; +Cc: x86, kvm, linux-kernel

Compile error with CONFIG_KVM_INTEL=y and W=1:

  CC      arch/x86/kvm/vmx/vmx.o
arch/x86/kvm/vmx/vmx.c:68:32: error: 'vmx_cpu_id' defined but not used [-Werror=unused-const-variable=]
   68 | static const struct x86_cpu_id vmx_cpu_id[] = {
      |                                ^~~~~~~~~~
cc1: all warnings being treated as errors

When building with =y, the MODULE_DEVICE_TABLE macro doesn't generate a
reference to the structure (or any code at all).  This makes W=1 compiles
unhappy.

Wrap both in a #ifdef to avoid the issue.

Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 40a1467d1655..5c2fc2177b0d 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -65,11 +65,13 @@
 MODULE_AUTHOR("Qumranet");
 MODULE_LICENSE("GPL");
 
+#ifdef MODULE
 static const struct x86_cpu_id vmx_cpu_id[] = {
 	X86_FEATURE_MATCH(X86_FEATURE_VMX),
 	{}
 };
 MODULE_DEVICE_TABLE(x86cpu, vmx_cpu_id);
+#endif
 
 bool __read_mostly enable_vpid = 1;
 module_param_named(vpid, enable_vpid, bool, 0444);


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

* Re: [PATCH] KVM: nVMX: allow compiling with W=1
  2020-02-28  2:49 [PATCH] KVM: nVMX: allow compiling with W=1 Valdis Klētnieks
@ 2020-02-28  9:36 ` Paolo Bonzini
  0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2020-02-28  9:36 UTC (permalink / raw)
  To: Valdis Klētnieks, Thomas Gleixner, Ingo Molnar
  Cc: x86, kvm, linux-kernel

On 28/02/20 03:49, Valdis Klētnieks wrote:
> Compile error with CONFIG_KVM_INTEL=y and W=1:
> 
>   CC      arch/x86/kvm/vmx/vmx.o
> arch/x86/kvm/vmx/vmx.c:68:32: error: 'vmx_cpu_id' defined but not used [-Werror=unused-const-variable=]
>    68 | static const struct x86_cpu_id vmx_cpu_id[] = {
>       |                                ^~~~~~~~~~
> cc1: all warnings being treated as errors
> 
> When building with =y, the MODULE_DEVICE_TABLE macro doesn't generate a
> reference to the structure (or any code at all).  This makes W=1 compiles
> unhappy.
> 
> Wrap both in a #ifdef to avoid the issue.
> 
> Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
> 
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index 40a1467d1655..5c2fc2177b0d 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -65,11 +65,13 @@
>  MODULE_AUTHOR("Qumranet");
>  MODULE_LICENSE("GPL");
>  
> +#ifdef MODULE
>  static const struct x86_cpu_id vmx_cpu_id[] = {
>  	X86_FEATURE_MATCH(X86_FEATURE_VMX),
>  	{}
>  };
>  MODULE_DEVICE_TABLE(x86cpu, vmx_cpu_id);
> +#endif
>  
>  bool __read_mostly enable_vpid = 1;
>  module_param_named(vpid, enable_vpid, bool, 0444);
> 

Queued, and doing the same for AMD.

Paolo


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

end of thread, other threads:[~2020-02-28  9:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-28  2:49 [PATCH] KVM: nVMX: allow compiling with W=1 Valdis Klētnieks
2020-02-28  9:36 ` Paolo Bonzini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).