diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-24 20:01:46 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-24 20:01:46 +0000 |
| commit | a7ddc49e790effe9d369d3aae3f5c1e2634c00da (patch) | |
| tree | ccab4932488c18fea6e3d9779d81aa2489047e02 /pkg/sentry | |
| parent | 9e6ec44f211e4f7777154bce00b5c463f9e8d8ee (diff) | |
| parent | ab6c474210cca380e8e6504bb2368b077f50ceae (diff) | |
Merge release-20200818.0-33-gab6c47421 (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/platform/kvm/bluepill_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/platform/kvm/machine_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/ptrace/subprocess_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_arm64.go | 3 | ||||
| -rw-r--r-- | pkg/sentry/vfs/mount_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/vfs/vfs_unsafe_state_autogen.go | 2 |
8 files changed, 9 insertions, 10 deletions
diff --git a/pkg/sentry/platform/kvm/bluepill_unsafe.go b/pkg/sentry/platform/kvm/bluepill_unsafe.go index bf357de1a..979be5d89 100644 --- a/pkg/sentry/platform/kvm/bluepill_unsafe.go +++ b/pkg/sentry/platform/kvm/bluepill_unsafe.go @@ -13,7 +13,7 @@ // limitations under the License. // +build go1.12 -// +build !go1.16 +// +build !go1.17 // Check go:linkname function signatures when updating Go version. diff --git a/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go index 6ea38ac86..04d30ac6d 100644 --- a/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go +++ b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go @@ -1,8 +1,8 @@ // automatically generated by stateify. // +build go1.12 -// +build !go1.16 +// +build !go1.17 // +build go1.12 -// +build !go1.16 +// +build !go1.17 package kvm diff --git a/pkg/sentry/platform/kvm/machine_unsafe.go b/pkg/sentry/platform/kvm/machine_unsafe.go index 9f86f6a7a..607c82156 100644 --- a/pkg/sentry/platform/kvm/machine_unsafe.go +++ b/pkg/sentry/platform/kvm/machine_unsafe.go @@ -13,7 +13,7 @@ // limitations under the License. // +build go1.12 -// +build !go1.16 +// +build !go1.17 // Check go:linkname function signatures when updating Go version. diff --git a/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go index b9e6c5057..8a2ebe8da 100644 --- a/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go +++ b/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go @@ -1,6 +1,6 @@ // automatically generated by stateify. // +build go1.12 -// +build !go1.16 +// +build !go1.17 package ptrace diff --git a/pkg/sentry/platform/ptrace/subprocess_unsafe.go b/pkg/sentry/platform/ptrace/subprocess_unsafe.go index 0bee995e4..7ee20d89a 100644 --- a/pkg/sentry/platform/ptrace/subprocess_unsafe.go +++ b/pkg/sentry/platform/ptrace/subprocess_unsafe.go @@ -13,7 +13,7 @@ // limitations under the License. // +build go1.12 -// +build !go1.16 +// +build !go1.17 // Check go:linkname function signatures when updating Go version. diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go index eda1e1484..9fb351879 100644 --- a/pkg/sentry/platform/ring0/defs_impl_arm64.go +++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go @@ -4,10 +4,9 @@ import ( "fmt" "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" + "gvisor.dev/gvisor/pkg/usermem" "io" "reflect" - - "gvisor.dev/gvisor/pkg/usermem" ) // Useful bits. diff --git a/pkg/sentry/vfs/mount_unsafe.go b/pkg/sentry/vfs/mount_unsafe.go index 777d631cb..da2a2e9c4 100644 --- a/pkg/sentry/vfs/mount_unsafe.go +++ b/pkg/sentry/vfs/mount_unsafe.go @@ -13,7 +13,7 @@ // limitations under the License. // +build go1.12 -// +build !go1.16 +// +build !go1.17 // Check go:linkname function signatures when updating Go version. diff --git a/pkg/sentry/vfs/vfs_unsafe_state_autogen.go b/pkg/sentry/vfs/vfs_unsafe_state_autogen.go index 37c5926c4..d34d60001 100644 --- a/pkg/sentry/vfs/vfs_unsafe_state_autogen.go +++ b/pkg/sentry/vfs/vfs_unsafe_state_autogen.go @@ -1,7 +1,7 @@ // automatically generated by stateify. // +build go1.12 -// +build !go1.16 +// +build !go1.17 package vfs |