From 58d094047fb1e61df8402ef854bd3bfb97826d6f Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Mon, 13 Sep 2021 13:30:11 +0000 Subject: sys: skip kvm const extraction for non i386/amd64 It is impossible to compile a number of definitions in include/uapi/linux/kvm.h for other platforms, which leads to syz-extract failing to update constants. Skip processing of this file for all arches except i386 and amd64. This is a hacky and (hopefully) temporary solution until #2754 is implemented. --- pkg/csource/generated.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg') diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 266ce6597..0726068e3 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -6639,7 +6639,7 @@ struct kvm_opt { #define KVM_SETUP_VIRT86 (1 << 4) #define KVM_SETUP_SMM (1 << 5) #define KVM_SETUP_VM (1 << 6) -static long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long a2, volatile long a3, volatile long a4, volatile long a5, volatile long a6, volatile long a7) +static volatile long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long a2, volatile long a3, volatile long a4, volatile long a5, volatile long a6, volatile long a7) { const int vmfd = a0; const int cpufd = a1; @@ -7181,7 +7181,7 @@ struct kvm_opt { uint64 typ; uint64 val; }; -static long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long a2, volatile long a3, volatile long a4, volatile long a5, volatile long a6, volatile long a7) +static volatile long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long a2, volatile long a3, volatile long a4, volatile long a5, volatile long a6, volatile long a7) { const int vmfd = a0; const int cpufd = a1; @@ -7378,7 +7378,7 @@ static void dump_text(const char* mem, unsigned start, unsigned cw, uint32 debug #define KVM_SETUP_PPC64_DR (1 << 2) #define KVM_SETUP_PPC64_PR (1 << 3) #define KVM_SETUP_PPC64_PID1 (1 << 4) -static long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long a2, volatile long a3, volatile long a4, volatile long a5, volatile long a6, volatile long a7) +static volatile long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long a2, volatile long a3, volatile long a4, volatile long a5, volatile long a6, volatile long a7) { const int vmfd = a0; const int cpufd = a1; @@ -7602,7 +7602,7 @@ static long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long } #elif !GOARCH_arm -static long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long a2, volatile long a3, volatile long a4, volatile long a5, volatile long a6, volatile long a7) +static volatile long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long a2, volatile long a3, volatile long a4, volatile long a5, volatile long a6, volatile long a7) { return 0; } -- cgit mrf-deployment