Skip to content

Commit

Permalink
powerpc: Rename is_kvm_guest() to check_kvm_guest()
Browse files Browse the repository at this point in the history
[ Upstream commit 16520a8 ]

We want to reuse the is_kvm_guest() name in a subsequent patch but
with a new body. Hence rename is_kvm_guest() to check_kvm_guest(). No
additional changes.

Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: Waiman Long <longman@redhat.com>
Signed-off-by: kernel test robot <lkp@intel.com> # int -> bool fix
[mpe: Fold in fix from lkp to use true/false not 0/1]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201202050456.164005-3-srikar@linux.vnet.ibm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
srikard authored and gregkh committed Nov 18, 2021
1 parent 61c5d9f commit 1132072
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/include/asm/kvm_guest.h
Expand Up @@ -7,9 +7,9 @@
#define _ASM_POWERPC_KVM_GUEST_H_

#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_KVM_GUEST)
bool is_kvm_guest(void);
bool check_kvm_guest(void);
#else
static inline bool is_kvm_guest(void) { return false; }
static inline bool check_kvm_guest(void) { return false; }
#endif

#endif /* _ASM_POWERPC_KVM_GUEST_H_ */
2 changes: 1 addition & 1 deletion arch/powerpc/include/asm/kvm_para.h
Expand Up @@ -14,7 +14,7 @@

static inline int kvm_para_available(void)
{
return IS_ENABLED(CONFIG_KVM_GUEST) && is_kvm_guest();
return IS_ENABLED(CONFIG_KVM_GUEST) && check_kvm_guest();
}

static inline unsigned int kvm_arch_para_features(void)
Expand Down
8 changes: 4 additions & 4 deletions arch/powerpc/kernel/firmware.c
Expand Up @@ -22,17 +22,17 @@ EXPORT_SYMBOL_GPL(powerpc_firmware_features);
#endif

#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_KVM_GUEST)
bool is_kvm_guest(void)
bool check_kvm_guest(void)
{
struct device_node *hyper_node;

hyper_node = of_find_node_by_path("/hypervisor");
if (!hyper_node)
return 0;
return false;

if (!of_device_is_compatible(hyper_node, "linux,kvm"))
return 0;
return false;

return 1;
return true;
}
#endif
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/pseries/smp.c
Expand Up @@ -208,7 +208,7 @@ static __init void pSeries_smp_probe(void)
if (!cpu_has_feature(CPU_FTR_SMT))
return;

if (is_kvm_guest()) {
if (check_kvm_guest()) {
/*
* KVM emulates doorbells by disabling FSCR[MSGP] so msgsndp
* faults to the hypervisor which then reads the instruction
Expand Down

0 comments on commit 1132072

Please sign in to comment.