Merge release-20210927.0-60-g8682ce689 (automated)

2 files changed, 10 insertions, 10 deletions

diff --git a/pkg/sentry/kernel/eventfd/eventfd.go b/pkg/sentry/kernel/eventfd/eventfd.go
index 5ea44a2c2..bf625dede 100644
--- a/pkg/sentry/kernel/eventfd/eventfd.go
+++ b/pkg/sentry/kernel/eventfd/eventfd.go
@@ -54,7 +54,7 @@ type EventOperations struct {
 
 	// Queue is used to notify interested parties when the event object
 	// becomes readable or writable.
-	wq waiter.Queue `state:"zerovalue"`
+	wq waiter.Queue
 
 	// val is the current value of the event counter.
 	val uint64
diff --git a/pkg/sentry/kernel/eventfd/eventfd_state_autogen.go b/pkg/sentry/kernel/eventfd/eventfd_state_autogen.go
index 596920c42..97b5089d1 100644
--- a/pkg/sentry/kernel/eventfd/eventfd_state_autogen.go
+++ b/pkg/sentry/kernel/eventfd/eventfd_state_autogen.go
@@ -12,6 +12,7 @@ func (e *EventOperations) StateTypeName() string {
 
 func (e *EventOperations) StateFields() []string {
 	return []string{
+		"wq",
 		"val",
 		"semMode",
 		"hostfd",
@@ -23,21 +24,20 @@ func (e *EventOperations) beforeSave() {}
 // +checklocksignore
 func (e *EventOperations) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
-	if !state.IsZeroValue(&e.wq) {
-		state.Failf("wq is %#v, expected zero", &e.wq)
-	}
-	stateSinkObject.Save(0, &e.val)
-	stateSinkObject.Save(1, &e.semMode)
-	stateSinkObject.Save(2, &e.hostfd)
+	stateSinkObject.Save(0, &e.wq)
+	stateSinkObject.Save(1, &e.val)
+	stateSinkObject.Save(2, &e.semMode)
+	stateSinkObject.Save(3, &e.hostfd)
 }
 
 func (e *EventOperations) afterLoad() {}
 
 // +checklocksignore
 func (e *EventOperations) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &e.val)
-	stateSourceObject.Load(1, &e.semMode)
-	stateSourceObject.Load(2, &e.hostfd)
+	stateSourceObject.Load(0, &e.wq)
+	stateSourceObject.Load(1, &e.val)
+	stateSourceObject.Load(2, &e.semMode)
+	stateSourceObject.Load(3, &e.hostfd)
 }
 
 func init() {