Merge release-20201208.0-31-g4cba3904f (automated)

2 files changed, 17 insertions, 17 deletions

diff --git a/pkg/sentry/mm/aio_context_state.go b/pkg/sentry/mm/aio_context_state.go
index 3dabac1af..e8931922f 100644
--- a/pkg/sentry/mm/aio_context_state.go
+++ b/pkg/sentry/mm/aio_context_state.go
@@ -15,6 +15,6 @@
 package mm
 
 // afterLoad is invoked by stateify.
-func (a *AIOContext) afterLoad() {
-	a.requestReady = make(chan struct{}, 1)
+func (ctx *AIOContext) afterLoad() {
+	ctx.requestReady = make(chan struct{}, 1)
 }
diff --git a/pkg/sentry/mm/mm_state_autogen.go b/pkg/sentry/mm/mm_state_autogen.go
index a2d098d30..60aee9d2e 100644
--- a/pkg/sentry/mm/mm_state_autogen.go
+++ b/pkg/sentry/mm/mm_state_autogen.go
@@ -55,11 +55,11 @@ func (i *ioResult) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(1, &i.ioEntry)
 }
 
-func (a *AIOContext) StateTypeName() string {
+func (ctx *AIOContext) StateTypeName() string {
 	return "pkg/sentry/mm.AIOContext"
 }
 
-func (a *AIOContext) StateFields() []string {
+func (ctx *AIOContext) StateFields() []string {
 	return []string{
 		"results",
 		"maxOutstanding",
@@ -67,23 +67,23 @@ func (a *AIOContext) StateFields() []string {
 	}
 }
 
-func (a *AIOContext) beforeSave() {}
+func (ctx *AIOContext) beforeSave() {}
 
-func (a *AIOContext) StateSave(stateSinkObject state.Sink) {
-	a.beforeSave()
-	if !state.IsZeroValue(&a.dead) {
-		state.Failf("dead is %#v, expected zero", &a.dead)
+func (ctx *AIOContext) StateSave(stateSinkObject state.Sink) {
+	ctx.beforeSave()
+	if !state.IsZeroValue(&ctx.dead) {
+		state.Failf("dead is %#v, expected zero", &ctx.dead)
 	}
-	stateSinkObject.Save(0, &a.results)
-	stateSinkObject.Save(1, &a.maxOutstanding)
-	stateSinkObject.Save(2, &a.outstanding)
+	stateSinkObject.Save(0, &ctx.results)
+	stateSinkObject.Save(1, &ctx.maxOutstanding)
+	stateSinkObject.Save(2, &ctx.outstanding)
 }
 
-func (a *AIOContext) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &a.results)
-	stateSourceObject.Load(1, &a.maxOutstanding)
-	stateSourceObject.Load(2, &a.outstanding)
-	stateSourceObject.AfterLoad(a.afterLoad)
+func (ctx *AIOContext) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &ctx.results)
+	stateSourceObject.Load(1, &ctx.maxOutstanding)
+	stateSourceObject.Load(2, &ctx.outstanding)
+	stateSourceObject.AfterLoad(ctx.afterLoad)
 }
 
 func (m *aioMappable) StateTypeName() string {