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. --- sys/syz-extract/linux.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sys/syz-extract/linux.go') diff --git a/sys/syz-extract/linux.go b/sys/syz-extract/linux.go index 05789ef55..47e5d20e6 100644 --- a/sys/syz-extract/linux.go +++ b/sys/syz-extract/linux.go @@ -12,6 +12,7 @@ import ( "github.com/google/syzkaller/pkg/compiler" "github.com/google/syzkaller/pkg/osutil" + "github.com/google/syzkaller/sys/targets" ) type linux struct{} @@ -134,7 +135,8 @@ func (*linux) prepareArch(arch *Arch) error { } func (*linux) processFile(arch *Arch, info *compiler.ConstInfo) (map[string]uint64, map[string]bool, error) { - if strings.HasSuffix(info.File, "_kvm.txt") && (arch.target.Arch == "arm" || arch.target.Arch == "riscv64") { + if strings.HasSuffix(info.File, "_kvm.txt") && + (arch.target.Arch == targets.ARM || arch.target.Arch == targets.RiscV64) { // Hack: KVM is not supported on ARM anymore. We may want some more official support // for marking descriptions arch-specific, but so far this combination is the only // one. For riscv64, KVM is not supported yet but might be in the future. -- cgit mrf-deployment