2018-11-08 03:21:31

by Yi Wang

Subject: [PATCH] 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: Yi Wang <[email protected]>
---
arch/x86/kvm/vmx.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 4555077..cd8355b 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1306,7 +1306,7 @@ static void vmx_get_segment(struct kvm_vcpu *vcpu,
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);
@@ -5944,7 +5944,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);
@@ -5982,7 +5982,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);
@@ -6020,7 +6020,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)
--
1.8.3.1

2018-11-25 17:38:03

by Paolo Bonzini

Subject: Re: [PATCH] x86/kvm/vmx: fix old-style function declaration

On 08/11/18 04:22, Yi Wang wrote:
> 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: Yi Wang <[email protected]>
> ---
> arch/x86/kvm/vmx.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 4555077..cd8355b 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -1306,7 +1306,7 @@ static void vmx_get_segment(struct kvm_vcpu *vcpu,
> 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);
> @@ -5944,7 +5944,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);
> @@ -5982,7 +5982,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);
> @@ -6020,7 +6020,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)
>

Queued, thanks.

Paolo