Commit 16520a85 authored by Srikar Dronamraju's avatar Srikar Dronamraju Committed by Michael Ellerman
Browse files

powerpc: Rename is_kvm_guest() to check_kvm_guest() 



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: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: default avatarWaiman 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: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201202050456.164005-3-srikar@linux.vnet.ibm.com
parent 92cc6bf0

arch/powerpc/include/asm/kvm_guest.h

+2 −2
Original line number Diff line number Diff line
@@ -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_ */

arch/powerpc/include/asm/kvm_para.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/powerpc/kernel/firmware.c

+4 −4
Original line number Diff line number Diff line
@@ -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

arch/powerpc/platforms/pseries/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,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