diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-07-28 01:18:12 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-28 01:18:12 +0000 |
| commit | a41384306d0ab75f6b0ceac3d5e0047531e3ad4f (patch) | |
| tree | d019e4466c09d970d368402ea4bf7f5d597fb0f2 /pkg/sentry/platform | |
| parent | ab1c2bd3680ffe5ff4a614bc320a9b367f3fdc8d (diff) | |
| parent | 964fb3ca768756fbc58d1d9312c53886964ae608 (diff) | |
Merge release-20210720.0-39-g964fb3ca7 (automated)
Diffstat (limited to 'pkg/sentry/platform')
11 files changed, 16 insertions, 14 deletions
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 |