diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-07 20:23:43 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-07 20:23:43 +0000 |
| commit | 03a34f6ddde4ba3c45ace56a6328bf85197625b4 (patch) | |
| tree | 680396b6e1b7929a44632681eb89b18b19b458ab /pkg/sentry/platform/kvm | |
| parent | 03daf4f9759e35beea2663b171f134fc48dde512 (diff) | |
| parent | 1f4087e7cd6c3cc696e6b26446abd6c5214cfd67 (diff) | |
Merge release-20200422.0-51-g1f4087e (automated)
Diffstat (limited to 'pkg/sentry/platform/kvm')
| -rwxr-xr-x | pkg/sentry/platform/kvm/kvm_state_autogen.go | 5 | ||||
| -rwxr-xr-x | pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkg/sentry/platform/kvm/kvm_state_autogen.go b/pkg/sentry/platform/kvm/kvm_state_autogen.go index 2325262dc..8d85b96d0 100755 --- a/pkg/sentry/platform/kvm/kvm_state_autogen.go +++ b/pkg/sentry/platform/kvm/kvm_state_autogen.go @@ -1,8 +1,3 @@ // automatically generated by stateify. -// +build go1.12 -// +build !go1.15 -// +build go1.12 -// +build !go1.15 - package kvm diff --git a/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go new file mode 100755 index 000000000..2325262dc --- /dev/null +++ b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go @@ -0,0 +1,8 @@ +// automatically generated by stateify. + +// +build go1.12 +// +build !go1.15 +// +build go1.12 +// +build !go1.15 + +package kvm |