From b9e1cf8404ce1263176643dee1a1cc835c9d1448 Mon Sep 17 00:00:00 2001
From: Zhaozhong Ni <nzz@google.com>
Date: Wed, 1 Aug 2018 15:42:07 -0700
Subject: stateify: convert all packages to use explicit mode.

PiperOrigin-RevId: 207007153
Change-Id: Ifedf1cc3758dc18be16647a4ece9c840c1c636c9
---
 pkg/sentry/kernel/futex/BUILD    | 18 ++----------------
 pkg/sentry/kernel/futex/futex.go |  2 ++
 2 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'pkg/sentry/kernel/futex')

diff --git a/pkg/sentry/kernel/futex/BUILD b/pkg/sentry/kernel/futex/BUILD
index a97a43549..b44a26974 100644
--- a/pkg/sentry/kernel/futex/BUILD
+++ b/pkg/sentry/kernel/futex/BUILD
@@ -1,7 +1,7 @@
 package(licenses = ["notice"])  # Apache 2.0
 
 load("//tools/go_generics:defs.bzl", "go_template_instance")
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify", "go_test")
+load("//tools/go_stateify:defs.bzl", "go_library", "go_test")
 
 go_template_instance(
     name = "waiter_list",
@@ -14,29 +14,15 @@ go_template_instance(
     },
 )
 
-go_stateify(
-    name = "futex_state",
-    srcs = [
-        "futex.go",
-        "waiter_list.go",
-    ],
-    out = "futex_state.go",
-    package = "futex",
-)
-
 go_library(
     name = "futex",
     srcs = [
         "futex.go",
-        "futex_state.go",
         "waiter_list.go",
     ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/sentry/kernel/futex",
     visibility = ["//pkg/sentry:internal"],
-    deps = [
-        "//pkg/state",
-        "//pkg/syserror",
-    ],
+    deps = ["//pkg/syserror"],
 )
 
 go_test(
diff --git a/pkg/sentry/kernel/futex/futex.go b/pkg/sentry/kernel/futex/futex.go
index 15e3e5e2c..4a1f2a0ef 100644
--- a/pkg/sentry/kernel/futex/futex.go
+++ b/pkg/sentry/kernel/futex/futex.go
@@ -196,6 +196,8 @@ func bucketIndexForAddr(addr uintptr) uintptr {
 }
 
 // Manager holds futex state for a single virtual address space.
+//
+// +stateify savable
 type Manager struct {
 	buckets [bucketCount]bucket `state:"zerovalue"`
 }
-- 
cgit v1.2.3