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

Commit 1e4329ee authored by Yi Wang's avatar Yi Wang Committed by Paolo Bonzini
Browse files

x86/kvm/vmx: fix old-style function declaration 



The inline keyword which is not at the beginning of the function
declaration may trigger the following build warnings, so let's fix it:

arch/x86/kvm/vmx.c:1309:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration]
arch/x86/kvm/vmx.c:5947:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration]
arch/x86/kvm/vmx.c:5985:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration]
arch/x86/kvm/vmx.c:6023:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration]

Signed-off-by: default avatarYi Wang <wang.yi59@zte.com.cn>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 354cb410

arch/x86/kvm/vmx.c

+4 −4
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked); 
static bool nested_vmx_is_page_fault_vmexit(struct vmcs12 *vmcs12,

					    u16 error_code);

static void vmx_update_msr_bitmap(struct kvm_vcpu *vcpu);

static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,

static __always_inline void vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,

							  u32 msr, int type);



static DEFINE_PER_CPU(struct vmcs *, vmxarea);
@@ -5956,7 +5956,7 @@ static void free_vpid(int vpid) 
	spin_unlock(&vmx_vpid_lock);

}



static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,

static __always_inline void vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,

							  u32 msr, int type)

{

	int f = sizeof(unsigned long);
@@ -5994,7 +5994,7 @@ static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bit 
	}

}



static void __always_inline vmx_enable_intercept_for_msr(unsigned long *msr_bitmap,

static __always_inline void vmx_enable_intercept_for_msr(unsigned long *msr_bitmap,

							 u32 msr, int type)

{

	int f = sizeof(unsigned long);
@@ -6032,7 +6032,7 @@ static void __always_inline vmx_enable_intercept_for_msr(unsigned long *msr_bitm 
	}

}



static void __always_inline vmx_set_intercept_for_msr(unsigned long *msr_bitmap,

static __always_inline void vmx_set_intercept_for_msr(unsigned long *msr_bitmap,

			     			      u32 msr, int type, bool value)

{

	if (value)