• Linus Torvalds's avatar
    x86: kvm: fix build error · 3f749bef
    Linus Torvalds authored
    The cpu_emergency_register_virt_callback() function is used
    unconditionally by the x86 kvm code, but it is declared (and defined)
    conditionally:
    
      #if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD)
      void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback);
      ...
    
    leading to a build error when neither KVM_INTEL nor KVM_AMD support is
    enabled:
    
      arch/x86/kvm/x86.c: In function ‘kvm_arch_enable_virtualization’:
      arch/x86/kvm/x86.c:12517:9: error: implicit declaration of function ‘cpu_emergency_register_virt_callback’ [-Wimplicit-function-declaration]
      12517 |         cpu_emergency_register_virt_callback(kvm_x86_ops.emergency_disable_virtualization_cpu);
            |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      arch/x86/kvm/x86.c: In function ‘kvm_arch_disable_virtualization’:
      arch/x86/kvm/x86.c:12522:9: error: implicit declaration of function ‘cpu_emergency_unregister_virt_callback’ [-Wimplicit-function-declaration]
      12522 |         cpu_emergency_unregister_virt_callback(kvm_x86_ops.emergency_disable_virtualization_cpu);
            |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    Fix the build by defining empty helper functions the same way the old
    cpu_emergency_disable_virtualization() function was dealt with for the
    same situation.
    
    Maybe we could instead have made the call sites conditional, since the
    callers (kvm_arch_{en,dis}able_virtualization()) have an empty weak
    fallback.  I'll leave that to the kvm people to argue about, this at
    least gets the build going for that particular config.
    
    Fixes: 590b09b1 ("KVM: x86: Register "emergency disable" callbacks when virt is enabled")
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Sean Christopherson <seanjc@google.com>
    Cc: Kai Huang <kai.huang@intel.com>
    Cc: Chao Gao <chao.gao@intel.com>
    Cc: Farrah Chen <farrah.chen@intel.com>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    3f749bef
reboot.h 1.43 KB