diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-29 22:46:46 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-29 22:46:46 +0000 |
| commit | 1ca003b78a6e1c633f5112b58f4ec81cf445afdf (patch) | |
| tree | d5186c91d929d14ad529f1b13d3581d9bea1d196 /pkg/sentry/platform/kvm | |
| parent | 7ce4a9b2edd6d65bbf3d21edc5db2bdae9b0cf49 (diff) | |
| parent | 65569cfca08a99e3700108cec64f3aa443c357b0 (diff) | |
Merge release-20200522.0-42-g65569cfc (automated)
Diffstat (limited to 'pkg/sentry/platform/kvm')
| -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 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkg/sentry/platform/kvm/bluepill_unsafe.go b/pkg/sentry/platform/kvm/bluepill_unsafe.go index 9add7c944..2407014e9 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.15 +// +build !go1.16 // 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 2325262dc..6ea38ac86 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.15 +// +build !go1.16 // +build go1.12 -// +build !go1.15 +// +build !go1.16 package kvm diff --git a/pkg/sentry/platform/kvm/machine_unsafe.go b/pkg/sentry/platform/kvm/machine_unsafe.go index f04be2ab5..de7df4f80 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.15 +// +build !go1.16 // Check go:linkname function signatures when updating Go version. |