2020-04-02 16:45:45

by Qian Cai

Subject: [PATCH -next] x86/kvm: fix a missing-prototypes "vmread_error"

The commit 842f4be95899 ("KVM: VMX: Add a trampoline to fix VMREAD error
handling") removed the declaration of vmread_error() causes a W=1 build
failure with KVM_WERROR=y. Fix it by adding it back.

arch/x86/kvm/vmx/vmx.c:359:17: error: no previous prototype for 'vmread_error' [-Werror=missing-prototypes]
asmlinkage void vmread_error(unsigned long field, bool fault)
^~~~~~~~~~~~

Signed-off-by: Qian Cai <[email protected]>
---
arch/x86/kvm/vmx/ops.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/x86/kvm/vmx/ops.h b/arch/x86/kvm/vmx/ops.h
index 09b0937d56b1..19717d0a1100 100644
--- a/arch/x86/kvm/vmx/ops.h
+++ b/arch/x86/kvm/vmx/ops.h
@@ -12,6 +12,7 @@

#define __ex(x) __kvm_handle_fault_on_reboot(x)

+asmlinkage void vmread_error(unsigned long field, bool fault);
__attribute__((regparm(0))) void vmread_error_trampoline(unsigned long field,
bool fault);
void vmwrite_error(unsigned long field, unsigned long value);
--
2.21.0 (Apple Git-122.2)

2020-04-02 19:39:51

by Paolo Bonzini

Subject: Re: [PATCH -next] x86/kvm: fix a missing-prototypes "vmread_error"

On 02/04/20 17:39, Qian Cai wrote:
> The commit 842f4be95899 ("KVM: VMX: Add a trampoline to fix VMREAD error
> handling") removed the declaration of vmread_error() causes a W=1 build
> failure with KVM_WERROR=y. Fix it by adding it back.
>
> arch/x86/kvm/vmx/vmx.c:359:17: error: no previous prototype for 'vmread_error' [-Werror=missing-prototypes]
> asmlinkage void vmread_error(unsigned long field, bool fault)
> ^~~~~~~~~~~~
>
> Signed-off-by: Qian Cai <[email protected]>
> ---
> arch/x86/kvm/vmx/ops.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/kvm/vmx/ops.h b/arch/x86/kvm/vmx/ops.h
> index 09b0937d56b1..19717d0a1100 100644
> --- a/arch/x86/kvm/vmx/ops.h
> +++ b/arch/x86/kvm/vmx/ops.h
> @@ -12,6 +12,7 @@
>
> #define __ex(x) __kvm_handle_fault_on_reboot(x)
>
> +asmlinkage void vmread_error(unsigned long field, bool fault);
> __attribute__((regparm(0))) void vmread_error_trampoline(unsigned long field,
> bool fault);
> void vmwrite_error(unsigned long field, unsigned long value);
>

Merged, thanks.

Paolo