diff --git a/executor/common_kvm.h b/executor/common_kvm.h index 5be283046360..68c5559d8d3d 100644 --- a/executor/common_kvm.h +++ b/executor/common_kvm.h @@ -8,7 +8,7 @@ #include "common_kvm_syzos.h" #include "kvm.h" -#if SYZ_EXECUTOR || __NR_syz_kvm_add_vcpu +#if SYZ_EXECUTOR || __NR_syz_kvm_add_vcpu || __NR_syz_kvm_setup_cpu || __NR_syz_kvm_setup_syzos_vm extern char* __start_guest; // executor_fn_guest_addr() is compiled into both the host and the guest code. diff --git a/executor/common_kvm_ppc64.h b/executor/common_kvm_ppc64.h index c154d70924e4..687c2bbd0d8c 100644 --- a/executor/common_kvm_ppc64.h +++ b/executor/common_kvm_ppc64.h @@ -73,12 +73,6 @@ // Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3 #define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg) -// For KVM_PPC_CONFIGURE_V3_MMU -struct kvm_ppc_mmuv3_cfg { - __u64 flags; - __u64 process_table; // second doubleword of partition table entry -}; - // Flag values for KVM_PPC_CONFIGURE_V3_MMU #define KVM_PPC_MMUV3_RADIX 1 // 1 = radix mode, 0 = HPT #define KVM_PPC_MMUV3_GTSE 2 // global translation shootdown enb @@ -185,7 +179,7 @@ static volatile long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volat if (kvm_vcpu_enable_cap(cpufd, KVM_CAP_PPC_PAPR)) return -1; - if (kvm_vm_enable_cap(vmfd, KVM_CAP_PPC_NESTED_HV, true, 0)) + if (kvm_vm_enable_cap(vmfd, KVM_CAP_PPC_NESTED_HV, 1, 0)) return -1; for (uintptr_t i = 0; i < guest_mem_size / page_size; i++) { diff --git a/pkg/csource/csource_test.go b/pkg/csource/csource_test.go index e48f197c35c5..f4cfe40a4a22 100644 --- a/pkg/csource/csource_test.go +++ b/pkg/csource/csource_test.go @@ -44,15 +44,14 @@ func TestGenerate(t *testing.T) { } t.Run(target.OS+"/"+target.Arch, func(t *testing.T) { full := !checked[target.OS] - if !full && testing.Short() { - return + if full || !testing.Short() { + if err := sysTarget.BrokenCompiler; err != "" { + t.Skipf("target compiler is broken: %v", err) + } + checked[target.OS] = true + t.Parallel() + testTarget(t, target, full) } - if err := sysTarget.BrokenCompiler; err != "" { - t.Skipf("target compiler is broken: %v", err) - } - checked[target.OS] = true - t.Parallel() - testTarget(t, target, full) testPseudoSyscalls(t, target) }) }