From e6e35dba937599d098fc034eff2686e5ddc409e9 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 26 Oct 2020 10:51:06 +0100 Subject: sys/targets: add OS/Arch name consts We use strings to identify OS/Arch. These strings are duplicated throughout the code base massively. golangci-lint points to possiblity of typos and duplication. We already had to define these names in pkg/csource and disable checking for prog package. A future change triggers such warnings in another package. Add OS/Arch name consts to sys/targets so that they can be used to refer to OS/Arch. Use the consts everywhere. --- pkg/build/netbsd.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkg/build/netbsd.go') diff --git a/pkg/build/netbsd.go b/pkg/build/netbsd.go index 43620c9cf..e0f4bcea0 100644 --- a/pkg/build/netbsd.go +++ b/pkg/build/netbsd.go @@ -16,6 +16,7 @@ import ( "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/report" + "github.com/google/syzkaller/sys/targets" "github.com/google/syzkaller/vm" ) @@ -104,7 +105,7 @@ func (ctx netbsd) copyKernelToDisk(targetArch, vmType, outputDir, kernel string) Image: filepath.Join(outputDir, "image"), SSHKey: filepath.Join(outputDir, "key"), SSHUser: "root", - TargetOS: "netbsd", + TargetOS: targets.NetBSD, TargetArch: targetArch, TargetVMArch: targetArch, Type: "qemu", -- cgit mrf-deployment