mirror of
https://github.com/torvalds/linux.git
synced 2026-04-25 10:02:31 -04:00
3f749befb0
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: 590b09b1d8 ("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: Linus Torvalds <torvalds@linux-foundation.org>
44 lines
1.4 KiB
C
44 lines
1.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_X86_REBOOT_H
|
|
#define _ASM_X86_REBOOT_H
|
|
|
|
#include <linux/kdebug.h>
|
|
|
|
struct pt_regs;
|
|
|
|
struct machine_ops {
|
|
void (*restart)(char *cmd);
|
|
void (*halt)(void);
|
|
void (*power_off)(void);
|
|
void (*shutdown)(void);
|
|
void (*crash_shutdown)(struct pt_regs *);
|
|
void (*emergency_restart)(void);
|
|
};
|
|
|
|
extern struct machine_ops machine_ops;
|
|
extern int crashing_cpu;
|
|
|
|
void native_machine_crash_shutdown(struct pt_regs *regs);
|
|
void native_machine_shutdown(void);
|
|
void __noreturn machine_real_restart(unsigned int type);
|
|
/* These must match dispatch in arch/x86/realmore/rm/reboot.S */
|
|
#define MRR_BIOS 0
|
|
#define MRR_APM 1
|
|
|
|
typedef void (cpu_emergency_virt_cb)(void);
|
|
#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD)
|
|
void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback);
|
|
void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback);
|
|
void cpu_emergency_disable_virtualization(void);
|
|
#else
|
|
static inline void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback) {}
|
|
static inline void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback) {}
|
|
static inline void cpu_emergency_disable_virtualization(void) {}
|
|
#endif /* CONFIG_KVM_INTEL || CONFIG_KVM_AMD */
|
|
|
|
typedef void (*nmi_shootdown_cb)(int, struct pt_regs*);
|
|
void nmi_shootdown_cpus(nmi_shootdown_cb callback);
|
|
void run_crash_ipi_callback(struct pt_regs *regs);
|
|
|
|
#endif /* _ASM_X86_REBOOT_H */
|