Merge release-20201019.0-51-g9f87400f0 (automated)

2 files changed, 8 insertions, 8 deletions

diff --git a/pkg/sentry/fsimpl/devpts/devpts_state_autogen.go b/pkg/sentry/fsimpl/devpts/devpts_state_autogen.go
index 1a294b64c..6383dd133 100644
--- a/pkg/sentry/fsimpl/devpts/devpts_state_autogen.go
+++ b/pkg/sentry/fsimpl/devpts/devpts_state_autogen.go
@@ -147,6 +147,8 @@ func (l *lineDiscipline) StateFields() []string {
 		"outQueue",
 		"termios",
 		"column",
+		"masterWaiter",
+		"replicaWaiter",
 	}
 }
 
@@ -154,17 +156,13 @@ func (l *lineDiscipline) beforeSave() {}
 
 func (l *lineDiscipline) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
-	if !state.IsZeroValue(&l.masterWaiter) {
-		state.Failf("masterWaiter is %#v, expected zero", &l.masterWaiter)
-	}
-	if !state.IsZeroValue(&l.replicaWaiter) {
-		state.Failf("replicaWaiter is %#v, expected zero", &l.replicaWaiter)
-	}
 	stateSinkObject.Save(0, &l.size)
 	stateSinkObject.Save(1, &l.inQueue)
 	stateSinkObject.Save(2, &l.outQueue)
 	stateSinkObject.Save(3, &l.termios)
 	stateSinkObject.Save(4, &l.column)
+	stateSinkObject.Save(5, &l.masterWaiter)
+	stateSinkObject.Save(6, &l.replicaWaiter)
 }
 
 func (l *lineDiscipline) afterLoad() {}
@@ -175,6 +173,8 @@ func (l *lineDiscipline) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(2, &l.outQueue)
 	stateSourceObject.Load(3, &l.termios)
 	stateSourceObject.Load(4, &l.column)
+	stateSourceObject.Load(5, &l.masterWaiter)
+	stateSourceObject.Load(6, &l.replicaWaiter)
 }
 
 func (o *outputQueueTransformer) StateTypeName() string {
diff --git a/pkg/sentry/fsimpl/devpts/line_discipline.go b/pkg/sentry/fsimpl/devpts/line_discipline.go
index e6b0e81cf..ae95fdd08 100644
--- a/pkg/sentry/fsimpl/devpts/line_discipline.go
+++ b/pkg/sentry/fsimpl/devpts/line_discipline.go
@@ -100,10 +100,10 @@ type lineDiscipline struct {
 	column int
 
 	// masterWaiter is used to wait on the master end of the TTY.
-	masterWaiter waiter.Queue `state:"zerovalue"`
+	masterWaiter waiter.Queue
 
 	// replicaWaiter is used to wait on the replica end of the TTY.
-	replicaWaiter waiter.Queue `state:"zerovalue"`
+	replicaWaiter waiter.Queue
 }
 
 func newLineDiscipline(termios linux.KernelTermios) *lineDiscipline {