summaryrefslogtreecommitdiffhomepage
path: root/pkg/cpuid
diff options
context:
space:
mode:
authorAyush Ranjan <ayushranjan@google.com>2021-03-03 10:23:55 -0800
committergVisor bot <gvisor-bot@google.com>2021-03-03 10:25:58 -0800
commita9441aea2780da8c93da1c73da860219f98438de (patch)
tree8b12915756f5bfb926218214cd7bc0b3281605fd /pkg/cpuid
parentb8a5420f49a2afd622ec08b5019e1bf537f7da82 (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/cpuid')
-rw-r--r--pkg/cpuid/BUILD1
-rw-r--r--pkg/cpuid/cpuid_parse_x86_test.go7
2 files changed, 5 insertions, 3 deletions
diff --git a/pkg/cpuid/BUILD b/pkg/cpuid/BUILD
index d6cb1a549..c0c864902 100644
--- a/pkg/cpuid/BUILD
+++ b/pkg/cpuid/BUILD
@@ -32,4 +32,5 @@ go_test(
],
library = ":cpuid",
tags = ["manual"],
+ deps = ["@org_golang_x_sys//unix:go_default_library"],
)
diff --git a/pkg/cpuid/cpuid_parse_x86_test.go b/pkg/cpuid/cpuid_parse_x86_test.go
index e4ae0d689..d60fdb550 100644
--- a/pkg/cpuid/cpuid_parse_x86_test.go
+++ b/pkg/cpuid/cpuid_parse_x86_test.go
@@ -22,13 +22,14 @@ import (
"regexp"
"strconv"
"strings"
- "syscall"
"testing"
+
+ "golang.org/x/sys/unix"
)
func kernelVersion() (int, int, error) {
- var u syscall.Utsname
- if err := syscall.Uname(&u); err != nil {
+ var u unix.Utsname
+ if err := unix.Uname(&u); err != nil {
return 0, 0, err
}