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/linux.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkg/build/linux.go') diff --git a/pkg/build/linux.go b/pkg/build/linux.go index 36f18b84f..7566eca21 100644 --- a/pkg/build/linux.go +++ b/pkg/build/linux.go @@ -18,6 +18,7 @@ import ( "time" "github.com/google/syzkaller/pkg/osutil" + "github.com/google/syzkaller/sys/targets" ) type linux struct{} @@ -57,9 +58,9 @@ func (linux linux) buildKernel(params *Params) error { // We build only zImage/bzImage as we currently don't use modules. var target string switch params.TargetArch { - case "386", "amd64", "s390x": + case targets.I386, targets.AMD64, targets.S390x: target = "bzImage" - case "ppc64le": + case targets.PPC64LE: target = "zImage" } @@ -110,11 +111,11 @@ func (linux) createImage(params *Params) error { var kernelImage string switch params.TargetArch { - case "386", "amd64": + case targets.I386, targets.AMD64: kernelImage = "arch/x86/boot/bzImage" - case "ppc64le": + case targets.PPC64LE: kernelImage = "arch/powerpc/boot/zImage.pseries" - case "s390x": + case targets.S390x: kernelImage = "arch/s390/boot/bzImage" } kernelImagePath := filepath.Join(params.KernelDir, filepath.FromSlash(kernelImage)) -- cgit mrf-deployment