diff options
author | Ayush Ranjan <ayushranjan@google.com> | 2021-03-03 10:23:55 -0800 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-03-03 10:25:58 -0800 |
commit | a9441aea2780da8c93da1c73da860219f98438de (patch) | |
tree | 8b12915756f5bfb926218214cd7bc0b3281605fd /pkg/safemem | |
parent | b8a5420f49a2afd622ec08b5019e1bf537f7da82 (diff) |
[op] Replace syscall package usage with golang.org/x/sys/unix in pkg/.
The syscall package has been deprecated in favor of golang.org/x/sys.
Note that syscall is still used in the following places:
- pkg/sentry/socket/hostinet/stack.go: some netlink related functionalities
are not yet available in golang.org/x/sys.
- syscall.Stat_t is still used in some places because os.FileInfo.Sys() still
returns it and not unix.Stat_t.
Updates #214
PiperOrigin-RevId: 360701387
Diffstat (limited to 'pkg/safemem')
-rw-r--r-- | pkg/safemem/BUILD | 1 | ||||
-rw-r--r-- | pkg/safemem/seq_unsafe.go | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkg/safemem/BUILD b/pkg/safemem/BUILD index d3b9b0ca9..3fda3a9cc 100644 --- a/pkg/safemem/BUILD +++ b/pkg/safemem/BUILD @@ -14,6 +14,7 @@ go_library( deps = [ "//pkg/gohacks", "//pkg/safecopy", + "@org_golang_x_sys//unix:go_default_library", ], ) diff --git a/pkg/safemem/seq_unsafe.go b/pkg/safemem/seq_unsafe.go index b315b0e5a..bbf8740a5 100644 --- a/pkg/safemem/seq_unsafe.go +++ b/pkg/safemem/seq_unsafe.go @@ -17,9 +17,9 @@ package safemem import ( "bytes" "fmt" - "syscall" "unsafe" + "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/gohacks" ) @@ -304,12 +304,12 @@ func ZeroSeq(dsts BlockSeq) (uint64, error) { return done, nil } -// IovecsFromBlockSeq returns a []syscall.Iovec representing seq. -func IovecsFromBlockSeq(bs BlockSeq) []syscall.Iovec { - iovs := make([]syscall.Iovec, 0, bs.NumBlocks()) +// IovecsFromBlockSeq returns a []unix.Iovec representing seq. +func IovecsFromBlockSeq(bs BlockSeq) []unix.Iovec { + iovs := make([]unix.Iovec, 0, bs.NumBlocks()) for ; !bs.IsEmpty(); bs = bs.Tail() { b := bs.Head() - iovs = append(iovs, syscall.Iovec{ + iovs = append(iovs, unix.Iovec{ Base: &b.ToSlice()[0], Len: uint64(b.Len()), }) |