Merge release-20200928.0-78-g743327817 (automated)

2 files changed, 48 insertions, 48 deletions

diff --git a/pkg/cpuid/cpuid_arm64_state_autogen.go b/pkg/cpuid/cpuid_arm64_state_autogen.go
index 656b8d001..d5911799d 100644
--- a/pkg/cpuid/cpuid_arm64_state_autogen.go
+++ b/pkg/cpuid/cpuid_arm64_state_autogen.go
@@ -8,11 +8,11 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
-func (f *FeatureSet) StateTypeName() string {
+func (fs *FeatureSet) StateTypeName() string {
 	return "pkg/cpuid.FeatureSet"
 }
 
-func (f *FeatureSet) StateFields() []string {
+func (fs *FeatureSet) StateFields() []string {
 	return []string{
 		"Set",
 		"CPUImplementer",
@@ -23,27 +23,27 @@ func (f *FeatureSet) StateFields() []string {
 	}
 }
 
-func (f *FeatureSet) beforeSave() {}
+func (fs *FeatureSet) beforeSave() {}
 
-func (f *FeatureSet) StateSave(stateSinkObject state.Sink) {
-	f.beforeSave()
-	stateSinkObject.Save(0, &f.Set)
-	stateSinkObject.Save(1, &f.CPUImplementer)
-	stateSinkObject.Save(2, &f.CPUArchitecture)
-	stateSinkObject.Save(3, &f.CPUVariant)
-	stateSinkObject.Save(4, &f.CPUPartnum)
-	stateSinkObject.Save(5, &f.CPURevision)
+func (fs *FeatureSet) StateSave(stateSinkObject state.Sink) {
+	fs.beforeSave()
+	stateSinkObject.Save(0, &fs.Set)
+	stateSinkObject.Save(1, &fs.CPUImplementer)
+	stateSinkObject.Save(2, &fs.CPUArchitecture)
+	stateSinkObject.Save(3, &fs.CPUVariant)
+	stateSinkObject.Save(4, &fs.CPUPartnum)
+	stateSinkObject.Save(5, &fs.CPURevision)
 }
 
-func (f *FeatureSet) afterLoad() {}
+func (fs *FeatureSet) afterLoad() {}
 
-func (f *FeatureSet) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &f.Set)
-	stateSourceObject.Load(1, &f.CPUImplementer)
-	stateSourceObject.Load(2, &f.CPUArchitecture)
-	stateSourceObject.Load(3, &f.CPUVariant)
-	stateSourceObject.Load(4, &f.CPUPartnum)
-	stateSourceObject.Load(5, &f.CPURevision)
+func (fs *FeatureSet) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &fs.Set)
+	stateSourceObject.Load(1, &fs.CPUImplementer)
+	stateSourceObject.Load(2, &fs.CPUArchitecture)
+	stateSourceObject.Load(3, &fs.CPUVariant)
+	stateSourceObject.Load(4, &fs.CPUPartnum)
+	stateSourceObject.Load(5, &fs.CPURevision)
 }
 
 func init() {
diff --git a/pkg/cpuid/cpuid_x86_state_autogen.go b/pkg/cpuid/cpuid_x86_state_autogen.go
index c73dd2291..023f8d742 100644
--- a/pkg/cpuid/cpuid_x86_state_autogen.go
+++ b/pkg/cpuid/cpuid_x86_state_autogen.go
@@ -55,11 +55,11 @@ func (c *Cache) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(8, &c.DirectMapped)
 }
 
-func (f *FeatureSet) StateTypeName() string {
+func (fs *FeatureSet) StateTypeName() string {
 	return "pkg/cpuid.FeatureSet"
 }
 
-func (f *FeatureSet) StateFields() []string {
+func (fs *FeatureSet) StateFields() []string {
 	return []string{
 		"Set",
 		"VendorID",
@@ -74,35 +74,35 @@ func (f *FeatureSet) StateFields() []string {
 	}
 }
 
-func (f *FeatureSet) beforeSave() {}
-
-func (f *FeatureSet) StateSave(stateSinkObject state.Sink) {
-	f.beforeSave()
-	stateSinkObject.Save(0, &f.Set)
-	stateSinkObject.Save(1, &f.VendorID)
-	stateSinkObject.Save(2, &f.ExtendedFamily)
-	stateSinkObject.Save(3, &f.ExtendedModel)
-	stateSinkObject.Save(4, &f.ProcessorType)
-	stateSinkObject.Save(5, &f.Family)
-	stateSinkObject.Save(6, &f.Model)
-	stateSinkObject.Save(7, &f.SteppingID)
-	stateSinkObject.Save(8, &f.Caches)
-	stateSinkObject.Save(9, &f.CacheLine)
+func (fs *FeatureSet) beforeSave() {}
+
+func (fs *FeatureSet) StateSave(stateSinkObject state.Sink) {
+	fs.beforeSave()
+	stateSinkObject.Save(0, &fs.Set)
+	stateSinkObject.Save(1, &fs.VendorID)
+	stateSinkObject.Save(2, &fs.ExtendedFamily)
+	stateSinkObject.Save(3, &fs.ExtendedModel)
+	stateSinkObject.Save(4, &fs.ProcessorType)
+	stateSinkObject.Save(5, &fs.Family)
+	stateSinkObject.Save(6, &fs.Model)
+	stateSinkObject.Save(7, &fs.SteppingID)
+	stateSinkObject.Save(8, &fs.Caches)
+	stateSinkObject.Save(9, &fs.CacheLine)
 }
 
-func (f *FeatureSet) afterLoad() {}
-
-func (f *FeatureSet) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &f.Set)
-	stateSourceObject.Load(1, &f.VendorID)
-	stateSourceObject.Load(2, &f.ExtendedFamily)
-	stateSourceObject.Load(3, &f.ExtendedModel)
-	stateSourceObject.Load(4, &f.ProcessorType)
-	stateSourceObject.Load(5, &f.Family)
-	stateSourceObject.Load(6, &f.Model)
-	stateSourceObject.Load(7, &f.SteppingID)
-	stateSourceObject.Load(8, &f.Caches)
-	stateSourceObject.Load(9, &f.CacheLine)
+func (fs *FeatureSet) afterLoad() {}
+
+func (fs *FeatureSet) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &fs.Set)
+	stateSourceObject.Load(1, &fs.VendorID)
+	stateSourceObject.Load(2, &fs.ExtendedFamily)
+	stateSourceObject.Load(3, &fs.ExtendedModel)
+	stateSourceObject.Load(4, &fs.ProcessorType)
+	stateSourceObject.Load(5, &fs.Family)
+	stateSourceObject.Load(6, &fs.Model)
+	stateSourceObject.Load(7, &fs.SteppingID)
+	stateSourceObject.Load(8, &fs.Caches)
+	stateSourceObject.Load(9, &fs.CacheLine)
 }
 
 func init() {