Merge release-20210315.0-15-gacb4c6288 (automated)

2 files changed, 12 insertions, 0 deletions

diff --git a/pkg/sentry/memmap/memmap_impl_state_autogen.go b/pkg/sentry/memmap/memmap_impl_state_autogen.go
index c77b19e77..d65558bbe 100644
--- a/pkg/sentry/memmap/memmap_impl_state_autogen.go
+++ b/pkg/sentry/memmap/memmap_impl_state_autogen.go
@@ -18,6 +18,7 @@ func (s *MappingSet) StateFields() []string {
 
 func (s *MappingSet) beforeSave() {}
 
+// +checklocksignore
 func (s *MappingSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *MappingSegmentDataSlices = s.saveRoot()
@@ -26,6 +27,7 @@ func (s *MappingSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *MappingSet) afterLoad() {}
 
+// +checklocksignore
 func (s *MappingSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*MappingSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*MappingSegmentDataSlices)) })
 }
@@ -49,6 +51,7 @@ func (n *Mappingnode) StateFields() []string {
 
 func (n *Mappingnode) beforeSave() {}
 
+// +checklocksignore
 func (n *Mappingnode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -63,6 +66,7 @@ func (n *Mappingnode) StateSave(stateSinkObject state.Sink) {
 
 func (n *Mappingnode) afterLoad() {}
 
+// +checklocksignore
 func (n *Mappingnode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -88,6 +92,7 @@ func (m *MappingSegmentDataSlices) StateFields() []string {
 
 func (m *MappingSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (m *MappingSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.Start)
@@ -97,6 +102,7 @@ func (m *MappingSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (m *MappingSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (m *MappingSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.Start)
 	stateSourceObject.Load(1, &m.End)
diff --git a/pkg/sentry/memmap/memmap_state_autogen.go b/pkg/sentry/memmap/memmap_state_autogen.go
index 7d52a10b2..8624ecb60 100644
--- a/pkg/sentry/memmap/memmap_state_autogen.go
+++ b/pkg/sentry/memmap/memmap_state_autogen.go
@@ -19,6 +19,7 @@ func (fr *FileRange) StateFields() []string {
 
 func (fr *FileRange) beforeSave() {}
 
+// +checklocksignore
 func (fr *FileRange) StateSave(stateSinkObject state.Sink) {
 	fr.beforeSave()
 	stateSinkObject.Save(0, &fr.Start)
@@ -27,6 +28,7 @@ func (fr *FileRange) StateSave(stateSinkObject state.Sink) {
 
 func (fr *FileRange) afterLoad() {}
 
+// +checklocksignore
 func (fr *FileRange) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fr.Start)
 	stateSourceObject.Load(1, &fr.End)
@@ -45,6 +47,7 @@ func (mr *MappableRange) StateFields() []string {
 
 func (mr *MappableRange) beforeSave() {}
 
+// +checklocksignore
 func (mr *MappableRange) StateSave(stateSinkObject state.Sink) {
 	mr.beforeSave()
 	stateSinkObject.Save(0, &mr.Start)
@@ -53,6 +56,7 @@ func (mr *MappableRange) StateSave(stateSinkObject state.Sink) {
 
 func (mr *MappableRange) afterLoad() {}
 
+// +checklocksignore
 func (mr *MappableRange) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mr.Start)
 	stateSourceObject.Load(1, &mr.End)
@@ -72,6 +76,7 @@ func (r *MappingOfRange) StateFields() []string {
 
 func (r *MappingOfRange) beforeSave() {}
 
+// +checklocksignore
 func (r *MappingOfRange) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.MappingSpace)
@@ -81,6 +86,7 @@ func (r *MappingOfRange) StateSave(stateSinkObject state.Sink) {
 
 func (r *MappingOfRange) afterLoad() {}
 
+// +checklocksignore
 func (r *MappingOfRange) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.MappingSpace)
 	stateSourceObject.Load(1, &r.AddrRange)