diff options
Diffstat (limited to 'pkg/sentry')
56 files changed, 107 insertions, 146 deletions
diff --git a/pkg/sentry/arch/arch_aarch64_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_aarch64_abi_autogen_unsafe.go index 7d3405576..0a1eae844 100644 --- a/pkg/sentry/arch/arch_aarch64_abi_autogen_unsafe.go +++ b/pkg/sentry/arch/arch_aarch64_abi_autogen_unsafe.go @@ -1,11 +1,12 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). +//go:build arm64 // +build arm64 package arch diff --git a/pkg/sentry/arch/arch_aarch64_state_autogen.go b/pkg/sentry/arch/arch_aarch64_state_autogen.go index 0463c0125..6faaa9f08 100644 --- a/pkg/sentry/arch/arch_aarch64_state_autogen.go +++ b/pkg/sentry/arch/arch_aarch64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build arm64 // +build arm64 package arch diff --git a/pkg/sentry/arch/arch_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_abi_autogen_unsafe.go index 2237dde67..2167ed9c9 100644 --- a/pkg/sentry/arch/arch_abi_autogen_unsafe.go +++ b/pkg/sentry/arch/arch_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package arch import ( diff --git a/pkg/sentry/arch/arch_amd64_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_amd64_abi_autogen_unsafe.go index dc203ca63..dd850b1b8 100644 --- a/pkg/sentry/arch/arch_amd64_abi_autogen_unsafe.go +++ b/pkg/sentry/arch/arch_amd64_abi_autogen_unsafe.go @@ -1,14 +1,13 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). -// +build amd64 -// +build amd64 -// +build amd64 +//go:build amd64 && amd64 && amd64 +// +build amd64,amd64,amd64 package arch diff --git a/pkg/sentry/arch/arch_amd64_state_autogen.go b/pkg/sentry/arch/arch_amd64_state_autogen.go index d74b4267b..501572f2c 100644 --- a/pkg/sentry/arch/arch_amd64_state_autogen.go +++ b/pkg/sentry/arch/arch_amd64_state_autogen.go @@ -1,8 +1,7 @@ // automatically generated by stateify. -// +build amd64 -// +build amd64 -// +build amd64 +//go:build amd64 && amd64 && amd64 +// +build amd64,amd64,amd64 package arch diff --git a/pkg/sentry/arch/arch_arm64_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_arm64_abi_autogen_unsafe.go index c17ced511..52ca0b185 100644 --- a/pkg/sentry/arch/arch_arm64_abi_autogen_unsafe.go +++ b/pkg/sentry/arch/arch_arm64_abi_autogen_unsafe.go @@ -1,14 +1,13 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). -// +build arm64 -// +build arm64 -// +build arm64 +//go:build arm64 && arm64 && arm64 +// +build arm64,arm64,arm64 package arch diff --git a/pkg/sentry/arch/arch_arm64_state_autogen.go b/pkg/sentry/arch/arch_arm64_state_autogen.go index 4f6fe0744..45bfbfca1 100644 --- a/pkg/sentry/arch/arch_arm64_state_autogen.go +++ b/pkg/sentry/arch/arch_arm64_state_autogen.go @@ -1,8 +1,7 @@ // automatically generated by stateify. -// +build arm64 -// +build arm64 -// +build arm64 +//go:build arm64 && arm64 && arm64 +// +build arm64,arm64,arm64 package arch diff --git a/pkg/sentry/arch/arch_unsafe_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_unsafe_abi_autogen_unsafe.go index 2237dde67..2167ed9c9 100644 --- a/pkg/sentry/arch/arch_unsafe_abi_autogen_unsafe.go +++ b/pkg/sentry/arch/arch_unsafe_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package arch import ( diff --git a/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go index f0ec25e8d..97a463c9f 100644 --- a/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go +++ b/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go @@ -1,11 +1,12 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). +//go:build (amd64 || 386) && (amd64 || 386) // +build amd64 386 // +build amd64 386 diff --git a/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go index f1968e054..2b2c59d95 100644 --- a/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go +++ b/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go @@ -1,11 +1,12 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). +//go:build (amd64 || 386) && go1.1 // +build amd64 386 // +build go1.1 diff --git a/pkg/sentry/arch/arch_x86_impl_state_autogen.go b/pkg/sentry/arch/arch_x86_impl_state_autogen.go index 1865a64dd..edcc2bee5 100644 --- a/pkg/sentry/arch/arch_x86_impl_state_autogen.go +++ b/pkg/sentry/arch/arch_x86_impl_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build (amd64 || 386) && go1.1 // +build amd64 386 // +build go1.1 diff --git a/pkg/sentry/arch/arch_x86_state_autogen.go b/pkg/sentry/arch/arch_x86_state_autogen.go index 7584e42c5..7785fb645 100644 --- a/pkg/sentry/arch/arch_x86_state_autogen.go +++ b/pkg/sentry/arch/arch_x86_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build (amd64 || 386) && (amd64 || 386) // +build amd64 386 // +build amd64 386 diff --git a/pkg/sentry/arch/fpu/fpu_amd64_state_autogen.go b/pkg/sentry/arch/fpu/fpu_amd64_state_autogen.go index 38db6e6f4..d31975f85 100644 --- a/pkg/sentry/arch/fpu/fpu_amd64_state_autogen.go +++ b/pkg/sentry/arch/fpu/fpu_amd64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build amd64 || i386 // +build amd64 i386 package fpu diff --git a/pkg/sentry/arch/fpu/fpu_arm64_state_autogen.go b/pkg/sentry/arch/fpu/fpu_arm64_state_autogen.go index cb7d1ca8a..7b28aba81 100644 --- a/pkg/sentry/arch/fpu/fpu_arm64_state_autogen.go +++ b/pkg/sentry/arch/fpu/fpu_arm64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build arm64 // +build arm64 package fpu diff --git a/pkg/sentry/fs/host/host_amd64_unsafe_state_autogen.go b/pkg/sentry/fs/host/host_amd64_unsafe_state_autogen.go index 488cbdfcf..14cecc49f 100644 --- a/pkg/sentry/fs/host/host_amd64_unsafe_state_autogen.go +++ b/pkg/sentry/fs/host/host_amd64_unsafe_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build amd64 // +build amd64 package host diff --git a/pkg/sentry/fs/host/host_arm64_unsafe_state_autogen.go b/pkg/sentry/fs/host/host_arm64_unsafe_state_autogen.go index 7371b44db..a714e619e 100644 --- a/pkg/sentry/fs/host/host_arm64_unsafe_state_autogen.go +++ b/pkg/sentry/fs/host/host_arm64_unsafe_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build arm64 // +build arm64 package host diff --git a/pkg/sentry/hostfd/hostfd_linux_state_autogen.go b/pkg/sentry/hostfd/hostfd_linux_state_autogen.go index 256bf270a..24e7ba400 100644 --- a/pkg/sentry/hostfd/hostfd_linux_state_autogen.go +++ b/pkg/sentry/hostfd/hostfd_linux_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build go1.1 // +build go1.1 package hostfd diff --git a/pkg/sentry/kernel/auth/auth_abi_autogen_unsafe.go b/pkg/sentry/kernel/auth/auth_abi_autogen_unsafe.go index 8ec71bc50..393dcea8c 100644 --- a/pkg/sentry/kernel/auth/auth_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/auth/auth_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package auth import ( diff --git a/pkg/sentry/kernel/auth/auth_unsafe_abi_autogen_unsafe.go b/pkg/sentry/kernel/auth/auth_unsafe_abi_autogen_unsafe.go index 7f4cbed94..ebcd3911b 100644 --- a/pkg/sentry/kernel/auth/auth_unsafe_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/auth/auth_unsafe_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package auth import ( diff --git a/pkg/sentry/kernel/kernel_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_abi_autogen_unsafe.go index f951fab78..83ed0f8ac 100644 --- a/pkg/sentry/kernel/kernel_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/kernel_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package kernel import ( diff --git a/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go index 49bde618c..988351acf 100644 --- a/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go @@ -1,11 +1,12 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). +//go:build amd64 // +build amd64 package kernel diff --git a/pkg/sentry/kernel/kernel_amd64_state_autogen.go b/pkg/sentry/kernel/kernel_amd64_state_autogen.go index 12de47ad0..859999676 100644 --- a/pkg/sentry/kernel/kernel_amd64_state_autogen.go +++ b/pkg/sentry/kernel/kernel_amd64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build amd64 // +build amd64 package kernel diff --git a/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go index ed40b65c6..823d08b19 100644 --- a/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go @@ -1,11 +1,12 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). +//go:build arm64 // +build arm64 package kernel diff --git a/pkg/sentry/kernel/kernel_arm64_state_autogen.go b/pkg/sentry/kernel/kernel_arm64_state_autogen.go index 3c040d283..7340674a6 100644 --- a/pkg/sentry/kernel/kernel_arm64_state_autogen.go +++ b/pkg/sentry/kernel/kernel_arm64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build arm64 // +build arm64 package kernel diff --git a/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go index 3e0693a12..dcca4b9dd 100644 --- a/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go @@ -1,11 +1,12 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). +//go:build go1.1 // +build go1.1 package kernel diff --git a/pkg/sentry/kernel/kernel_opts_state_autogen.go b/pkg/sentry/kernel/kernel_opts_state_autogen.go index 3a027c5ed..d878d9a06 100644 --- a/pkg/sentry/kernel/kernel_opts_state_autogen.go +++ b/pkg/sentry/kernel/kernel_opts_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build go1.1 // +build go1.1 package kernel diff --git a/pkg/sentry/kernel/kernel_unsafe_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_unsafe_abi_autogen_unsafe.go index 9c39d630a..5d810c89c 100644 --- a/pkg/sentry/kernel/kernel_unsafe_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/kernel_unsafe_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package kernel import ( diff --git a/pkg/sentry/loader/loader_abi_autogen_unsafe.go b/pkg/sentry/loader/loader_abi_autogen_unsafe.go index bfa048912..618cb60fc 100644 --- a/pkg/sentry/loader/loader_abi_autogen_unsafe.go +++ b/pkg/sentry/loader/loader_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package loader import ( diff --git a/pkg/sentry/platform/kvm/kvm_amd64_state_autogen.go b/pkg/sentry/platform/kvm/kvm_amd64_state_autogen.go index a69cbee8b..1bc956971 100644 --- a/pkg/sentry/platform/kvm/kvm_amd64_state_autogen.go +++ b/pkg/sentry/platform/kvm/kvm_amd64_state_autogen.go @@ -1,7 +1,6 @@ // automatically generated by stateify. -// +build amd64 -// +build amd64 -// +build amd64 +//go:build amd64 && amd64 && amd64 +// +build amd64,amd64,amd64 package kvm diff --git a/pkg/sentry/platform/kvm/kvm_amd64_unsafe_state_autogen.go b/pkg/sentry/platform/kvm/kvm_amd64_unsafe_state_autogen.go index a69cbee8b..1bc956971 100644 --- a/pkg/sentry/platform/kvm/kvm_amd64_unsafe_state_autogen.go +++ b/pkg/sentry/platform/kvm/kvm_amd64_unsafe_state_autogen.go @@ -1,7 +1,6 @@ // automatically generated by stateify. -// +build amd64 -// +build amd64 -// +build amd64 +//go:build amd64 && amd64 && amd64 +// +build amd64,amd64,amd64 package kvm diff --git a/pkg/sentry/platform/kvm/kvm_arm64_state_autogen.go b/pkg/sentry/platform/kvm/kvm_arm64_state_autogen.go index 90183b764..fc675a238 100644 --- a/pkg/sentry/platform/kvm/kvm_arm64_state_autogen.go +++ b/pkg/sentry/platform/kvm/kvm_arm64_state_autogen.go @@ -1,7 +1,6 @@ // automatically generated by stateify. -// +build arm64 -// +build arm64 -// +build arm64 +//go:build arm64 && arm64 && arm64 +// +build arm64,arm64,arm64 package kvm diff --git a/pkg/sentry/platform/kvm/kvm_arm64_unsafe_state_autogen.go b/pkg/sentry/platform/kvm/kvm_arm64_unsafe_state_autogen.go index 90183b764..fc675a238 100644 --- a/pkg/sentry/platform/kvm/kvm_arm64_unsafe_state_autogen.go +++ b/pkg/sentry/platform/kvm/kvm_arm64_unsafe_state_autogen.go @@ -1,7 +1,6 @@ // automatically generated by stateify. -// +build arm64 -// +build arm64 -// +build arm64 +//go:build arm64 && arm64 && arm64 +// +build arm64,arm64,arm64 package kvm diff --git a/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go index f1270c722..fbf940222 100644 --- a/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go +++ b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go @@ -1,6 +1,6 @@ // automatically generated by stateify. -// +build go1.12,!go1.18 -// +build go1.12,!go1.18 +//go:build go1.12 && !go1.18 && go1.12 && !go1.18 +// +build go1.12,!go1.18,go1.12,!go1.18 package kvm diff --git a/pkg/sentry/platform/ptrace/ptrace_amd64_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_amd64_state_autogen.go index f730ab393..9a5228154 100644 --- a/pkg/sentry/platform/ptrace/ptrace_amd64_state_autogen.go +++ b/pkg/sentry/platform/ptrace/ptrace_amd64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build amd64 // +build amd64 package ptrace diff --git a/pkg/sentry/platform/ptrace/ptrace_arm64_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_arm64_state_autogen.go index 6239d1305..477523841 100644 --- a/pkg/sentry/platform/ptrace/ptrace_arm64_state_autogen.go +++ b/pkg/sentry/platform/ptrace/ptrace_arm64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build arm64 // +build arm64 package ptrace diff --git a/pkg/sentry/platform/ptrace/ptrace_arm64_unsafe_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_arm64_unsafe_state_autogen.go index 6239d1305..477523841 100644 --- a/pkg/sentry/platform/ptrace/ptrace_arm64_unsafe_state_autogen.go +++ b/pkg/sentry/platform/ptrace/ptrace_arm64_unsafe_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build arm64 // +build arm64 package ptrace diff --git a/pkg/sentry/platform/ptrace/ptrace_linux_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_linux_state_autogen.go index 9f90aef93..fcfee0226 100644 --- a/pkg/sentry/platform/ptrace/ptrace_linux_state_autogen.go +++ b/pkg/sentry/platform/ptrace/ptrace_linux_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build linux // +build linux package ptrace diff --git a/pkg/sentry/platform/ptrace/ptrace_linux_unsafe_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_linux_unsafe_state_autogen.go index 45d94c547..bf3fccfcb 100644 --- a/pkg/sentry/platform/ptrace/ptrace_linux_unsafe_state_autogen.go +++ b/pkg/sentry/platform/ptrace/ptrace_linux_unsafe_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build linux && (amd64 || arm64) // +build linux // +build amd64 arm64 diff --git a/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go index ab4ad223e..66758e4ba 100644 --- a/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go +++ b/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build go1.12 && !go1.18 // +build go1.12,!go1.18 package ptrace diff --git a/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go b/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go index 7dd0e5006..e52b4a6d6 100644 --- a/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go +++ b/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build go1.1 // +build go1.1 package hostinet diff --git a/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go b/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go index ea4abc34f..786b62935 100644 --- a/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go +++ b/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package netfilter import ( diff --git a/pkg/sentry/state/state_state_autogen.go b/pkg/sentry/state/state_state_autogen.go index e3e199293..305f03f52 100644 --- a/pkg/sentry/state/state_state_autogen.go +++ b/pkg/sentry/state/state_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build go1.1 // +build go1.1 package state diff --git a/pkg/sentry/strace/strace_amd64_state_autogen.go b/pkg/sentry/strace/strace_amd64_state_autogen.go index c7d4b3eb4..2a3d1077f 100644 --- a/pkg/sentry/strace/strace_amd64_state_autogen.go +++ b/pkg/sentry/strace/strace_amd64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build amd64 // +build amd64 package strace diff --git a/pkg/sentry/strace/strace_arm64_state_autogen.go b/pkg/sentry/strace/strace_arm64_state_autogen.go index 9b8f66dc9..c64c9df57 100644 --- a/pkg/sentry/strace/strace_arm64_state_autogen.go +++ b/pkg/sentry/strace/strace_arm64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build arm64 // +build arm64 package strace diff --git a/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go index 8539f13c3..409927919 100644 --- a/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go +++ b/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package linux import ( diff --git a/pkg/sentry/syscalls/linux/linux_amd64_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/linux_amd64_abi_autogen_unsafe.go index 8238cf9c8..84d67731a 100644 --- a/pkg/sentry/syscalls/linux/linux_amd64_abi_autogen_unsafe.go +++ b/pkg/sentry/syscalls/linux/linux_amd64_abi_autogen_unsafe.go @@ -1,14 +1,13 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). -// +build amd64 -// +build amd64 -// +build amd64 +//go:build amd64 && amd64 && amd64 +// +build amd64,amd64,amd64 package linux diff --git a/pkg/sentry/syscalls/linux/linux_amd64_state_autogen.go b/pkg/sentry/syscalls/linux/linux_amd64_state_autogen.go index b3e3be0b6..19f7a855e 100644 --- a/pkg/sentry/syscalls/linux/linux_amd64_state_autogen.go +++ b/pkg/sentry/syscalls/linux/linux_amd64_state_autogen.go @@ -1,7 +1,6 @@ // automatically generated by stateify. -// +build amd64 -// +build amd64 -// +build amd64 +//go:build amd64 && amd64 && amd64 +// +build amd64,amd64,amd64 package linux diff --git a/pkg/sentry/syscalls/linux/linux_arm64_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/linux_arm64_abi_autogen_unsafe.go index 6f0f546ea..6bbdf8d79 100644 --- a/pkg/sentry/syscalls/linux/linux_arm64_abi_autogen_unsafe.go +++ b/pkg/sentry/syscalls/linux/linux_arm64_abi_autogen_unsafe.go @@ -1,14 +1,13 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). -// +build arm64 -// +build arm64 -// +build arm64 +//go:build arm64 && arm64 && arm64 +// +build arm64,arm64,arm64 package linux diff --git a/pkg/sentry/syscalls/linux/linux_arm64_state_autogen.go b/pkg/sentry/syscalls/linux/linux_arm64_state_autogen.go index f03e36ddc..ecc524560 100644 --- a/pkg/sentry/syscalls/linux/linux_arm64_state_autogen.go +++ b/pkg/sentry/syscalls/linux/linux_arm64_state_autogen.go @@ -1,7 +1,6 @@ // automatically generated by stateify. -// +build arm64 -// +build arm64 -// +build arm64 +//go:build arm64 && arm64 && arm64 +// +build arm64,arm64,arm64 package linux diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go index 0525fce4c..01b0d465f 100644 --- a/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go +++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package vfs2 import ( diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_abi_autogen_unsafe.go index f07118503..d5335190c 100644 --- a/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_abi_autogen_unsafe.go +++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_abi_autogen_unsafe.go @@ -1,11 +1,12 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). +//go:build amd64 // +build amd64 package vfs2 diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_state_autogen.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_state_autogen.go index 7f5556f9c..467b4258c 100644 --- a/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_state_autogen.go +++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build amd64 // +build amd64 package vfs2 diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_abi_autogen_unsafe.go index ea1f77a0f..07ab07d17 100644 --- a/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_abi_autogen_unsafe.go +++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_abi_autogen_unsafe.go @@ -1,11 +1,12 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). +//go:build arm64 // +build arm64 package vfs2 diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_state_autogen.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_state_autogen.go index 3e3862045..2e1a50af5 100644 --- a/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_state_autogen.go +++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build arm64 // +build arm64 package vfs2 diff --git a/pkg/sentry/time/time_amd64_state_autogen.go b/pkg/sentry/time/time_amd64_state_autogen.go index a4d3199ac..3306b8b88 100644 --- a/pkg/sentry/time/time_amd64_state_autogen.go +++ b/pkg/sentry/time/time_amd64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build amd64 // +build amd64 package time diff --git a/pkg/sentry/time/time_arm64_state_autogen.go b/pkg/sentry/time/time_arm64_state_autogen.go index 6929b58cd..233d240c4 100644 --- a/pkg/sentry/time/time_arm64_state_autogen.go +++ b/pkg/sentry/time/time_arm64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build arm64 // +build arm64 package time |