From 48bc529a18de54dddab161d995fc3abd85a670a8 Mon Sep 17 00:00:00 2001 From: Space Meyer Date: Mon, 9 Jan 2023 13:51:24 +0100 Subject: pkg/instance: move BuildKernel() args to struct --- tools/syz-testbuild/testbuild.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'tools') 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) -- cgit mrf-deployment