Merge release-20200928.0-66-ga55bd73d4 (automated)

3 files changed, 85 insertions, 85 deletions

diff --git a/pkg/sentry/memmap/memmap.go b/pkg/sentry/memmap/memmap.go
index a44fa2b95..7fd77925f 100644
--- a/pkg/sentry/memmap/memmap.go
+++ b/pkg/sentry/memmap/memmap.go
@@ -127,7 +127,7 @@ func (t Translation) FileRange() FileRange {
 // Preconditions: Same as Mappable.Translate.
 func CheckTranslateResult(required, optional MappableRange, at usermem.AccessType, ts []Translation, terr error) error {
 	// Verify that the inputs to Mappable.Translate were valid.
-	if !required.WellFormed() || required.Length() <= 0 {
+	if !required.WellFormed() || required.Length() == 0 {
 		panic(fmt.Sprintf("invalid required range: %v", required))
 	}
 	if !usermem.Addr(required.Start).IsPageAligned() || !usermem.Addr(required.End).IsPageAligned() {
@@ -145,7 +145,7 @@ func CheckTranslateResult(required, optional MappableRange, at usermem.AccessTyp
 		return fmt.Errorf("first Translation %+v does not cover start of required range %v", ts[0], required)
 	}
 	for i, t := range ts {
-		if !t.Source.WellFormed() || t.Source.Length() <= 0 {
+		if !t.Source.WellFormed() || t.Source.Length() == 0 {
 			return fmt.Errorf("Translation %+v has invalid Source", t)
 		}
 		if !usermem.Addr(t.Source.Start).IsPageAligned() || !usermem.Addr(t.Source.End).IsPageAligned() {
diff --git a/pkg/sentry/memmap/memmap_impl_state_autogen.go b/pkg/sentry/memmap/memmap_impl_state_autogen.go
index ed4ab58cb..e6fcd3582 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 (x *MappingSet) StateTypeName() string {
+func (m *MappingSet) StateTypeName() string {
 	return "pkg/sentry/memmap.MappingSet"
 }
 
-func (x *MappingSet) StateFields() []string {
+func (m *MappingSet) StateFields() []string {
 	return []string{
 		"root",
 	}
 }
 
-func (x *MappingSet) beforeSave() {}
+func (m *MappingSet) beforeSave() {}
 
-func (x *MappingSet) StateSave(m state.Sink) {
-	x.beforeSave()
-	var root *MappingSegmentDataSlices = x.saveRoot()
-	m.SaveValue(0, root)
+func (m *MappingSet) StateSave(stateSinkObject state.Sink) {
+	m.beforeSave()
+	var rootValue *MappingSegmentDataSlices = m.saveRoot()
+	stateSinkObject.SaveValue(0, rootValue)
 }
 
-func (x *MappingSet) afterLoad() {}
+func (m *MappingSet) afterLoad() {}
 
-func (x *MappingSet) StateLoad(m state.Source) {
-	m.LoadValue(0, new(*MappingSegmentDataSlices), func(y interface{}) { x.loadRoot(y.(*MappingSegmentDataSlices)) })
+func (m *MappingSet) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.LoadValue(0, new(*MappingSegmentDataSlices), func(y interface{}) { m.loadRoot(y.(*MappingSegmentDataSlices)) })
 }
 
-func (x *Mappingnode) StateTypeName() string {
+func (m *Mappingnode) StateTypeName() string {
 	return "pkg/sentry/memmap.Mappingnode"
 }
 
-func (x *Mappingnode) StateFields() []string {
+func (m *Mappingnode) StateFields() []string {
 	return []string{
 		"nrSegments",
 		"parent",
@@ -47,38 +47,38 @@ func (x *Mappingnode) StateFields() []string {
 	}
 }
 
-func (x *Mappingnode) beforeSave() {}
-
-func (x *Mappingnode) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.nrSegments)
-	m.Save(1, &x.parent)
-	m.Save(2, &x.parentIndex)
-	m.Save(3, &x.hasChildren)
-	m.Save(4, &x.maxGap)
-	m.Save(5, &x.keys)
-	m.Save(6, &x.values)
-	m.Save(7, &x.children)
+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 (x *Mappingnode) afterLoad() {}
-
-func (x *Mappingnode) StateLoad(m state.Source) {
-	m.Load(0, &x.nrSegments)
-	m.Load(1, &x.parent)
-	m.Load(2, &x.parentIndex)
-	m.Load(3, &x.hasChildren)
-	m.Load(4, &x.maxGap)
-	m.Load(5, &x.keys)
-	m.Load(6, &x.values)
-	m.Load(7, &x.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 (x *MappingSegmentDataSlices) StateTypeName() string {
+func (m *MappingSegmentDataSlices) StateTypeName() string {
 	return "pkg/sentry/memmap.MappingSegmentDataSlices"
 }
 
-func (x *MappingSegmentDataSlices) StateFields() []string {
+func (m *MappingSegmentDataSlices) StateFields() []string {
 	return []string{
 		"Start",
 		"End",
@@ -86,21 +86,21 @@ func (x *MappingSegmentDataSlices) StateFields() []string {
 	}
 }
 
-func (x *MappingSegmentDataSlices) beforeSave() {}
+func (m *MappingSegmentDataSlices) beforeSave() {}
 
-func (x *MappingSegmentDataSlices) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.Start)
-	m.Save(1, &x.End)
-	m.Save(2, &x.Values)
+func (m *MappingSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
+	m.beforeSave()
+	stateSinkObject.Save(0, &m.Start)
+	stateSinkObject.Save(1, &m.End)
+	stateSinkObject.Save(2, &m.Values)
 }
 
-func (x *MappingSegmentDataSlices) afterLoad() {}
+func (m *MappingSegmentDataSlices) afterLoad() {}
 
-func (x *MappingSegmentDataSlices) StateLoad(m state.Source) {
-	m.Load(0, &x.Start)
-	m.Load(1, &x.End)
-	m.Load(2, &x.Values)
+func (m *MappingSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &m.Start)
+	stateSourceObject.Load(1, &m.End)
+	stateSourceObject.Load(2, &m.Values)
 }
 
 func init() {
diff --git a/pkg/sentry/memmap/memmap_state_autogen.go b/pkg/sentry/memmap/memmap_state_autogen.go
index 4feb2eb66..55ccf8cfd 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 (x *FileRange) StateTypeName() string {
+func (f *FileRange) StateTypeName() string {
 	return "pkg/sentry/memmap.FileRange"
 }
 
-func (x *FileRange) StateFields() []string {
+func (f *FileRange) StateFields() []string {
 	return []string{
 		"Start",
 		"End",
 	}
 }
 
-func (x *FileRange) beforeSave() {}
+func (f *FileRange) beforeSave() {}
 
-func (x *FileRange) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.Start)
-	m.Save(1, &x.End)
+func (f *FileRange) StateSave(stateSinkObject state.Sink) {
+	f.beforeSave()
+	stateSinkObject.Save(0, &f.Start)
+	stateSinkObject.Save(1, &f.End)
 }
 
-func (x *FileRange) afterLoad() {}
+func (f *FileRange) afterLoad() {}
 
-func (x *FileRange) StateLoad(m state.Source) {
-	m.Load(0, &x.Start)
-	m.Load(1, &x.End)
+func (f *FileRange) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &f.Start)
+	stateSourceObject.Load(1, &f.End)
 }
 
-func (x *MappableRange) StateTypeName() string {
+func (m *MappableRange) StateTypeName() string {
 	return "pkg/sentry/memmap.MappableRange"
 }
 
-func (x *MappableRange) StateFields() []string {
+func (m *MappableRange) StateFields() []string {
 	return []string{
 		"Start",
 		"End",
 	}
 }
 
-func (x *MappableRange) beforeSave() {}
+func (m *MappableRange) beforeSave() {}
 
-func (x *MappableRange) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.Start)
-	m.Save(1, &x.End)
+func (m *MappableRange) StateSave(stateSinkObject state.Sink) {
+	m.beforeSave()
+	stateSinkObject.Save(0, &m.Start)
+	stateSinkObject.Save(1, &m.End)
 }
 
-func (x *MappableRange) afterLoad() {}
+func (m *MappableRange) afterLoad() {}
 
-func (x *MappableRange) StateLoad(m state.Source) {
-	m.Load(0, &x.Start)
-	m.Load(1, &x.End)
+func (m *MappableRange) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &m.Start)
+	stateSourceObject.Load(1, &m.End)
 }
 
-func (x *MappingOfRange) StateTypeName() string {
+func (m *MappingOfRange) StateTypeName() string {
 	return "pkg/sentry/memmap.MappingOfRange"
 }
 
-func (x *MappingOfRange) StateFields() []string {
+func (m *MappingOfRange) StateFields() []string {
 	return []string{
 		"MappingSpace",
 		"AddrRange",
@@ -70,21 +70,21 @@ func (x *MappingOfRange) StateFields() []string {
 	}
 }
 
-func (x *MappingOfRange) beforeSave() {}
+func (m *MappingOfRange) beforeSave() {}
 
-func (x *MappingOfRange) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.MappingSpace)
-	m.Save(1, &x.AddrRange)
-	m.Save(2, &x.Writable)
+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 (x *MappingOfRange) afterLoad() {}
+func (m *MappingOfRange) afterLoad() {}
 
-func (x *MappingOfRange) StateLoad(m state.Source) {
-	m.Load(0, &x.MappingSpace)
-	m.Load(1, &x.AddrRange)
-	m.Load(2, &x.Writable)
+func (m *MappingOfRange) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &m.MappingSpace)
+	stateSourceObject.Load(1, &m.AddrRange)
+	stateSourceObject.Load(2, &m.Writable)
 }
 
 func init() {