diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-21 18:31:58 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-21 18:31:58 +0000 |
| commit | 9836bf11b6aec373bd73142e6dc3965b46d0e363 (patch) | |
| tree | 7e032d03ea3b4d7d3b6ccc871c8ce3c36e572335 | |
| parent | bbb135e87199a4ef766246273c6ee6554f779d6b (diff) | |
| parent | 335fd987b0d4f7c8e9a720b68fa5f3848500db51 (diff) | |
Merge 335fd987 (automated)
| -rwxr-xr-x | pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go | 6 | ||||
| -rwxr-xr-x | pkg/sentry/platform/ring0/defs_impl.go | 5 | ||||
| -rwxr-xr-x | pkg/sentry/time/seqatomic_parameters.go | 6 | ||||
| -rw-r--r-- | runsc/sandbox/sandbox.go | 1 |
4 files changed, 8 insertions, 10 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go index 895abb129..25ad17a4e 100755 --- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go +++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go @@ -1,12 +1,12 @@ package kernel import ( - "unsafe" - "fmt" - "gvisor.dev/gvisor/third_party/gvsync" "reflect" "strings" + "unsafe" + + "gvisor.dev/gvisor/third_party/gvsync" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race diff --git a/pkg/sentry/platform/ring0/defs_impl.go b/pkg/sentry/platform/ring0/defs_impl.go index ea3f514cd..5032ac56e 100755 --- a/pkg/sentry/platform/ring0/defs_impl.go +++ b/pkg/sentry/platform/ring0/defs_impl.go @@ -1,14 +1,13 @@ package ring0 import ( - "gvisor.dev/gvisor/pkg/cpuid" - "syscall" - "fmt" + "gvisor.dev/gvisor/pkg/cpuid" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" "gvisor.dev/gvisor/pkg/sentry/usermem" "io" "reflect" + "syscall" ) var ( diff --git a/pkg/sentry/time/seqatomic_parameters.go b/pkg/sentry/time/seqatomic_parameters.go index f6560d0bb..89792c56d 100755 --- a/pkg/sentry/time/seqatomic_parameters.go +++ b/pkg/sentry/time/seqatomic_parameters.go @@ -1,12 +1,12 @@ package time import ( - "unsafe" - "fmt" - "gvisor.dev/gvisor/third_party/gvsync" "reflect" "strings" + "unsafe" + + "gvisor.dev/gvisor/third_party/gvsync" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go index 54ed7f990..3bd0291c0 100644 --- a/runsc/sandbox/sandbox.go +++ b/runsc/sandbox/sandbox.go @@ -440,7 +440,6 @@ func (s *Sandbox) createSandboxProcess(conf *boot.Config, args *Args, startSyncF // Note that the Ctty field must be the FD of the TTY in the // *new* process, not this process. Since we are about to // assign the TTY to nextFD, we can use that value here. - // stdin, we can use FD 0 here. cmd.SysProcAttr.Setctty = true cmd.SysProcAttr.Ctty = nextFD |