Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba492962 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: Move kvm_guest_init out of generic code 



Currently x86 is the only architecture that uses kvm_guest_init(). With
PowerPC we're getting a second user, but the signature is different there
and we don't need to export it, as it uses the normal kernel init framework.

So let's move the x86 specific definition of that function over to the x86
specfic header file.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 5fc87407

arch/x86/include/asm/kvm_para.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -158,6 +158,12 @@ static inline unsigned int kvm_arch_para_features(void) 
	return cpuid_eax(KVM_CPUID_FEATURES);

	return cpuid_eax(KVM_CPUID_FEATURES);

}

}





#ifdef CONFIG_KVM_GUEST

void __init kvm_guest_init(void);

#else

#define kvm_guest_init() do { } while (0)

#endif

#endif





#endif /* __KERNEL__ */



#endif /* _ASM_X86_KVM_PARA_H */
 
#endif /* _ASM_X86_KVM_PARA_H */

include/linux/kvm_para.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -26,11 +26,6 @@ 
#include <asm/kvm_para.h>

#include <asm/kvm_para.h>





#ifdef __KERNEL__

#ifdef __KERNEL__

#ifdef CONFIG_KVM_GUEST

void __init kvm_guest_init(void);

#else

#define kvm_guest_init() do { } while (0)

#endif





static inline int kvm_para_has_feature(unsigned int feature)

static inline int kvm_para_has_feature(unsigned int feature)

{

{