diff options
| author | Zach Koopmans <zkoopmans@google.com> | 2021-03-29 13:28:32 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-03-29 13:30:21 -0700 |
| commit | 8a2f7e716dcc62f04d2808e8ade34941c94fc956 (patch) | |
| tree | b2195d5728dcbc4f4e59c23ad95d7486ef744371 /pkg/sentry/strace/select.go | |
| parent | b125afba416ebeba906ea595a44a55afe4729d64 (diff) | |
[syserror] Split usermem package
Split usermem package to help remove syserror dependency in go_marshal.
New hostarch package contains code not dependent on syserror.
PiperOrigin-RevId: 365651233
Diffstat (limited to 'pkg/sentry/strace/select.go')
| -rw-r--r-- | pkg/sentry/strace/select.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/sentry/strace/select.go b/pkg/sentry/strace/select.go index 3a4c32aa0..e6e928157 100644 --- a/pkg/sentry/strace/select.go +++ b/pkg/sentry/strace/select.go @@ -19,7 +19,8 @@ import ( "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sentry/syscalls/linux" - "gvisor.dev/gvisor/pkg/usermem" + + "gvisor.dev/gvisor/pkg/hostarch" ) func fdsFromSet(t *kernel.Task, set []byte) []int { @@ -35,7 +36,7 @@ func fdsFromSet(t *kernel.Task, set []byte) []int { return fds } -func fdSet(t *kernel.Task, nfds int, addr usermem.Addr) string { +func fdSet(t *kernel.Task, nfds int, addr hostarch.Addr) string { if nfds < 0 { return fmt.Sprintf("%#x (negative nfds)", addr) } |