Merge release-20200928.0-78-g743327817 (automated)

2 files changed, 69 insertions, 69 deletions

diff --git a/pkg/sentry/memmap/memmap_impl_state_autogen.go b/pkg/sentry/memmap/memmap_impl_state_autogen.go
index e6fcd3582..c77b19e77 100644
--- a/pkg/sentry/memmap/memmap_impl_state_autogen.go
+++ b/pkg/sentry/memmap/memmap_impl_state_autogen.go
@@ -6,35 +6,35 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
-func (m *MappingSet) StateTypeName() string {
+func (s *MappingSet) StateTypeName() string {
 	return "pkg/sentry/memmap.MappingSet"
 }
 
-func (m *MappingSet) StateFields() []string {
+func (s *MappingSet) StateFields() []string {
 	return []string{
 		"root",
 	}
 }
 
-func (m *MappingSet) beforeSave() {}
+func (s *MappingSet) beforeSave() {}
 
-func (m *MappingSet) StateSave(stateSinkObject state.Sink) {
-	m.beforeSave()
-	var rootValue *MappingSegmentDataSlices = m.saveRoot()
+func (s *MappingSet) StateSave(stateSinkObject state.Sink) {
+	s.beforeSave()
+	var rootValue *MappingSegmentDataSlices = s.saveRoot()
 	stateSinkObject.SaveValue(0, rootValue)
 }
 
-func (m *MappingSet) afterLoad() {}
+func (s *MappingSet) afterLoad() {}
 
-func (m *MappingSet) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.LoadValue(0, new(*MappingSegmentDataSlices), func(y interface{}) { m.loadRoot(y.(*MappingSegmentDataSlices)) })
+func (s *MappingSet) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.LoadValue(0, new(*MappingSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*MappingSegmentDataSlices)) })
 }
 
-func (m *Mappingnode) StateTypeName() string {
+func (n *Mappingnode) StateTypeName() string {
 	return "pkg/sentry/memmap.Mappingnode"
 }
 
-func (m *Mappingnode) StateFields() []string {
+func (n *Mappingnode) StateFields() []string {
 	return []string{
 		"nrSegments",
 		"parent",
@@ -47,31 +47,31 @@ func (m *Mappingnode) StateFields() []string {
 	}
 }
 
-func (m *Mappingnode) beforeSave() {}
-
-func (m *Mappingnode) StateSave(stateSinkObject state.Sink) {
-	m.beforeSave()
-	stateSinkObject.Save(0, &m.nrSegments)
-	stateSinkObject.Save(1, &m.parent)
-	stateSinkObject.Save(2, &m.parentIndex)
-	stateSinkObject.Save(3, &m.hasChildren)
-	stateSinkObject.Save(4, &m.maxGap)
-	stateSinkObject.Save(5, &m.keys)
-	stateSinkObject.Save(6, &m.values)
-	stateSinkObject.Save(7, &m.children)
+func (n *Mappingnode) beforeSave() {}
+
+func (n *Mappingnode) StateSave(stateSinkObject state.Sink) {
+	n.beforeSave()
+	stateSinkObject.Save(0, &n.nrSegments)
+	stateSinkObject.Save(1, &n.parent)
+	stateSinkObject.Save(2, &n.parentIndex)
+	stateSinkObject.Save(3, &n.hasChildren)
+	stateSinkObject.Save(4, &n.maxGap)
+	stateSinkObject.Save(5, &n.keys)
+	stateSinkObject.Save(6, &n.values)
+	stateSinkObject.Save(7, &n.children)
 }
 
-func (m *Mappingnode) afterLoad() {}
-
-func (m *Mappingnode) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &m.nrSegments)
-	stateSourceObject.Load(1, &m.parent)
-	stateSourceObject.Load(2, &m.parentIndex)
-	stateSourceObject.Load(3, &m.hasChildren)
-	stateSourceObject.Load(4, &m.maxGap)
-	stateSourceObject.Load(5, &m.keys)
-	stateSourceObject.Load(6, &m.values)
-	stateSourceObject.Load(7, &m.children)
+func (n *Mappingnode) afterLoad() {}
+
+func (n *Mappingnode) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &n.nrSegments)
+	stateSourceObject.Load(1, &n.parent)
+	stateSourceObject.Load(2, &n.parentIndex)
+	stateSourceObject.Load(3, &n.hasChildren)
+	stateSourceObject.Load(4, &n.maxGap)
+	stateSourceObject.Load(5, &n.keys)
+	stateSourceObject.Load(6, &n.values)
+	stateSourceObject.Load(7, &n.children)
 }
 
 func (m *MappingSegmentDataSlices) StateTypeName() string {
diff --git a/pkg/sentry/memmap/memmap_state_autogen.go b/pkg/sentry/memmap/memmap_state_autogen.go
index 55ccf8cfd..7d52a10b2 100644
--- a/pkg/sentry/memmap/memmap_state_autogen.go
+++ b/pkg/sentry/memmap/memmap_state_autogen.go
@@ -6,63 +6,63 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
-func (f *FileRange) StateTypeName() string {
+func (fr *FileRange) StateTypeName() string {
 	return "pkg/sentry/memmap.FileRange"
 }
 
-func (f *FileRange) StateFields() []string {
+func (fr *FileRange) StateFields() []string {
 	return []string{
 		"Start",
 		"End",
 	}
 }
 
-func (f *FileRange) beforeSave() {}
+func (fr *FileRange) beforeSave() {}
 
-func (f *FileRange) StateSave(stateSinkObject state.Sink) {
-	f.beforeSave()
-	stateSinkObject.Save(0, &f.Start)
-	stateSinkObject.Save(1, &f.End)
+func (fr *FileRange) StateSave(stateSinkObject state.Sink) {
+	fr.beforeSave()
+	stateSinkObject.Save(0, &fr.Start)
+	stateSinkObject.Save(1, &fr.End)
 }
 
-func (f *FileRange) afterLoad() {}
+func (fr *FileRange) afterLoad() {}
 
-func (f *FileRange) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &f.Start)
-	stateSourceObject.Load(1, &f.End)
+func (fr *FileRange) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &fr.Start)
+	stateSourceObject.Load(1, &fr.End)
 }
 
-func (m *MappableRange) StateTypeName() string {
+func (mr *MappableRange) StateTypeName() string {
 	return "pkg/sentry/memmap.MappableRange"
 }
 
-func (m *MappableRange) StateFields() []string {
+func (mr *MappableRange) StateFields() []string {
 	return []string{
 		"Start",
 		"End",
 	}
 }
 
-func (m *MappableRange) beforeSave() {}
+func (mr *MappableRange) beforeSave() {}
 
-func (m *MappableRange) StateSave(stateSinkObject state.Sink) {
-	m.beforeSave()
-	stateSinkObject.Save(0, &m.Start)
-	stateSinkObject.Save(1, &m.End)
+func (mr *MappableRange) StateSave(stateSinkObject state.Sink) {
+	mr.beforeSave()
+	stateSinkObject.Save(0, &mr.Start)
+	stateSinkObject.Save(1, &mr.End)
 }
 
-func (m *MappableRange) afterLoad() {}
+func (mr *MappableRange) afterLoad() {}
 
-func (m *MappableRange) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &m.Start)
-	stateSourceObject.Load(1, &m.End)
+func (mr *MappableRange) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &mr.Start)
+	stateSourceObject.Load(1, &mr.End)
 }
 
-func (m *MappingOfRange) StateTypeName() string {
+func (r *MappingOfRange) StateTypeName() string {
 	return "pkg/sentry/memmap.MappingOfRange"
 }
 
-func (m *MappingOfRange) StateFields() []string {
+func (r *MappingOfRange) StateFields() []string {
 	return []string{
 		"MappingSpace",
 		"AddrRange",
@@ -70,21 +70,21 @@ func (m *MappingOfRange) StateFields() []string {
 	}
 }
 
-func (m *MappingOfRange) beforeSave() {}
+func (r *MappingOfRange) beforeSave() {}
 
-func (m *MappingOfRange) StateSave(stateSinkObject state.Sink) {
-	m.beforeSave()
-	stateSinkObject.Save(0, &m.MappingSpace)
-	stateSinkObject.Save(1, &m.AddrRange)
-	stateSinkObject.Save(2, &m.Writable)
+func (r *MappingOfRange) StateSave(stateSinkObject state.Sink) {
+	r.beforeSave()
+	stateSinkObject.Save(0, &r.MappingSpace)
+	stateSinkObject.Save(1, &r.AddrRange)
+	stateSinkObject.Save(2, &r.Writable)
 }
 
-func (m *MappingOfRange) afterLoad() {}
+func (r *MappingOfRange) afterLoad() {}
 
-func (m *MappingOfRange) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &m.MappingSpace)
-	stateSourceObject.Load(1, &m.AddrRange)
-	stateSourceObject.Load(2, &m.Writable)
+func (r *MappingOfRange) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &r.MappingSpace)
+	stateSourceObject.Load(1, &r.AddrRange)
+	stateSourceObject.Load(2, &r.Writable)
 }
 
 func init() {