diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-24 00:53:27 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-24 00:53:27 +0000 |
| commit | 70cbe923d390e91fc05b06dfa05c6810b0701037 (patch) | |
| tree | fba2e949690078ba4ffef65d03a2bdfaa9b01b61 /pkg/sentry/fsimpl/eventfd | |
| parent | b1dbae4ae486840d512fc3e0ba8606ae66580234 (diff) | |
| parent | 9f87400f087df0492cf181c97f431b6d5ce3a987 (diff) | |
Merge release-20201019.0-51-g9f87400f0 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/eventfd')
| -rw-r--r-- | pkg/sentry/fsimpl/eventfd/eventfd.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/eventfd/eventfd_state_autogen.go | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkg/sentry/fsimpl/eventfd/eventfd.go b/pkg/sentry/fsimpl/eventfd/eventfd.go index 1c27ad700..5b29f2358 100644 --- a/pkg/sentry/fsimpl/eventfd/eventfd.go +++ b/pkg/sentry/fsimpl/eventfd/eventfd.go @@ -43,7 +43,7 @@ type EventFileDescription struct { // queue is used to notify interested parties when the event object // becomes readable or writable. - queue waiter.Queue `state:"zerovalue"` + queue waiter.Queue // mu protects the fields below. mu sync.Mutex `state:"nosave"` diff --git a/pkg/sentry/fsimpl/eventfd/eventfd_state_autogen.go b/pkg/sentry/fsimpl/eventfd/eventfd_state_autogen.go index 1c19f900a..3af030742 100644 --- a/pkg/sentry/fsimpl/eventfd/eventfd_state_autogen.go +++ b/pkg/sentry/fsimpl/eventfd/eventfd_state_autogen.go @@ -16,6 +16,7 @@ func (efd *EventFileDescription) StateFields() []string { "FileDescriptionDefaultImpl", "DentryMetadataFileDescriptionImpl", "NoLockFD", + "queue", "val", "semMode", "hostfd", @@ -26,16 +27,14 @@ func (efd *EventFileDescription) beforeSave() {} func (efd *EventFileDescription) StateSave(stateSinkObject state.Sink) { efd.beforeSave() - if !state.IsZeroValue(&efd.queue) { - state.Failf("queue is %#v, expected zero", &efd.queue) - } stateSinkObject.Save(0, &efd.vfsfd) stateSinkObject.Save(1, &efd.FileDescriptionDefaultImpl) stateSinkObject.Save(2, &efd.DentryMetadataFileDescriptionImpl) stateSinkObject.Save(3, &efd.NoLockFD) - stateSinkObject.Save(4, &efd.val) - stateSinkObject.Save(5, &efd.semMode) - stateSinkObject.Save(6, &efd.hostfd) + stateSinkObject.Save(4, &efd.queue) + stateSinkObject.Save(5, &efd.val) + stateSinkObject.Save(6, &efd.semMode) + stateSinkObject.Save(7, &efd.hostfd) } func (efd *EventFileDescription) afterLoad() {} @@ -45,9 +44,10 @@ func (efd *EventFileDescription) StateLoad(stateSourceObject state.Source) { stateSourceObject.Load(1, &efd.FileDescriptionDefaultImpl) stateSourceObject.Load(2, &efd.DentryMetadataFileDescriptionImpl) stateSourceObject.Load(3, &efd.NoLockFD) - stateSourceObject.Load(4, &efd.val) - stateSourceObject.Load(5, &efd.semMode) - stateSourceObject.Load(6, &efd.hostfd) + stateSourceObject.Load(4, &efd.queue) + stateSourceObject.Load(5, &efd.val) + stateSourceObject.Load(6, &efd.semMode) + stateSourceObject.Load(7, &efd.hostfd) } func init() { |