aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSpace Meyer <spm@google.com>2023-01-09 13:51:24 +0100
committerSpace Meyer <git@the-space.agency>2023-01-09 14:25:36 +0100
commit48bc529a18de54dddab161d995fc3abd85a670a8 (patch)
treef6e8c2b6483271922d388aa7e53b90ae9ae4fe9c /tools
parentdf3838a1b408f22e5df7cd986138d6ec5768369d (diff)
pkg/instance: move BuildKernel() args to struct
Diffstat (limited to 'tools')
-rw-r--r--tools/syz-testbuild/testbuild.go11
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/syz-testbuild/testbuild.go b/tools/syz-testbuild/testbuild.go
index 29c24e010..4ce4a3616 100644
--- a/tools/syz-testbuild/testbuild.go
+++ b/tools/syz-testbuild/testbuild.go
@@ -134,8 +134,15 @@ func test(repo vcs.Repo, bisecter vcs.Bisecter, kernelConfig []byte, env instanc
if err := build.Clean(*flagOS, *flagArch, vmType, *flagKernelSrc); err != nil {
tool.Fail(err)
}
- _, _, err = env.BuildKernel(bisectEnv.Compiler, linker, ccache, *flagUserspace,
- *flagKernelCmdline, *flagKernelSysctl, bisectEnv.KernelConfig)
+ _, _, err = env.BuildKernel(&instance.BuildKernelConfig{
+ CompilerBin: bisectEnv.Compiler,
+ LinkerBin: linker,
+ CcacheBin: ccache,
+ UserspaceDir: *flagUserspace,
+ CmdlineFile: *flagKernelCmdline,
+ SysctlFile: *flagKernelSysctl,
+ KernelConfig: bisectEnv.KernelConfig,
+ })
if err != nil {
if verr, ok := err.(*osutil.VerboseError); ok {
log.Printf("BUILD BROKEN: %v", verr.Title)