From 57d0fcbdbf7e9d2d573ce8d4ca2f72b82f778d63 Mon Sep 17 00:00:00 2001
From: Zhaozhong Ni <nzz@google.com>
Date: Thu, 2 Aug 2018 10:41:44 -0700
Subject: Automated rollback of changelist 207037226

PiperOrigin-RevId: 207125440
Change-Id: I6c572afb4d693ee72a0c458a988b0e96d191cd49
---
 pkg/sentry/socket/epsocket/BUILD       | 16 +---------------
 pkg/sentry/socket/epsocket/epsocket.go |  2 ++
 pkg/sentry/socket/epsocket/stack.go    |  2 ++
 3 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'pkg/sentry/socket/epsocket')

diff --git a/pkg/sentry/socket/epsocket/BUILD b/pkg/sentry/socket/epsocket/BUILD
index 7ad5e88c5..49af8db85 100644
--- a/pkg/sentry/socket/epsocket/BUILD
+++ b/pkg/sentry/socket/epsocket/BUILD
@@ -1,24 +1,12 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify")
-
-go_stateify(
-    name = "epsocket_state",
-    srcs = [
-        "epsocket.go",
-        "save_restore.go",
-        "stack.go",
-    ],
-    out = "epsocket_state.go",
-    package = "epsocket",
-)
+load("//tools/go_stateify:defs.bzl", "go_library")
 
 go_library(
     name = "epsocket",
     srcs = [
         "device.go",
         "epsocket.go",
-        "epsocket_state.go",
         "provider.go",
         "save_restore.go",
         "stack.go",
@@ -31,7 +19,6 @@ go_library(
         "//pkg/abi/linux",
         "//pkg/binary",
         "//pkg/log",
-        "//pkg/refs",
         "//pkg/sentry/arch",
         "//pkg/sentry/context",
         "//pkg/sentry/device",
@@ -44,7 +31,6 @@ go_library(
         "//pkg/sentry/safemem",
         "//pkg/sentry/socket",
         "//pkg/sentry/usermem",
-        "//pkg/state",
         "//pkg/syserr",
         "//pkg/syserror",
         "//pkg/tcpip",
diff --git a/pkg/sentry/socket/epsocket/epsocket.go b/pkg/sentry/socket/epsocket/epsocket.go
index a2927e1b9..f969a1d7c 100644
--- a/pkg/sentry/socket/epsocket/epsocket.go
+++ b/pkg/sentry/socket/epsocket/epsocket.go
@@ -95,6 +95,8 @@ type commonEndpoint interface {
 
 // SocketOperations encapsulates all the state needed to represent a network stack
 // endpoint in the kernel context.
+//
+// +stateify savable
 type SocketOperations struct {
 	socket.ReceiveTimeout
 	fsutil.PipeSeek      `state:"nosave"`
diff --git a/pkg/sentry/socket/epsocket/stack.go b/pkg/sentry/socket/epsocket/stack.go
index ec1d96ccb..12b4b4767 100644
--- a/pkg/sentry/socket/epsocket/stack.go
+++ b/pkg/sentry/socket/epsocket/stack.go
@@ -26,6 +26,8 @@ import (
 )
 
 // Stack implements inet.Stack for netstack/tcpip/stack.Stack.
+//
+// +stateify savable
 type Stack struct {
 	Stack *stack.Stack `state:"manual"`
 }
-- 
cgit v1.2.3