Merge release-20200323.0-119-g7812661 (automated)

6 files changed, 18 insertions, 18 deletions

diff --git a/pkg/sentry/fs/fs_state_autogen.go b/pkg/sentry/fs/fs_state_autogen.go
index f6d6286c2..502a90d71 100755
--- a/pkg/sentry/fs/fs_state_autogen.go
+++ b/pkg/sentry/fs/fs_state_autogen.go
@@ -190,11 +190,11 @@ func (x *Dirent) load(m state.Map) {
 func (x *DirentCache) beforeSave() {}
 func (x *DirentCache) save(m state.Map) {
 	x.beforeSave()
-	if !state.IsZeroValue(x.currentSize) {
-		m.Failf("currentSize is %v, expected zero", x.currentSize)
+	if !state.IsZeroValue(&x.currentSize) {
+		m.Failf("currentSize is %#v, expected zero", &x.currentSize)
 	}
-	if !state.IsZeroValue(x.list) {
-		m.Failf("list is %v, expected zero", x.list)
+	if !state.IsZeroValue(&x.list) {
+		m.Failf("list is %#v, expected zero", &x.list)
 	}
 	m.Save("maxSize", &x.maxSize)
 	m.Save("limit", &x.limit)
@@ -209,8 +209,8 @@ func (x *DirentCache) load(m state.Map) {
 func (x *DirentCacheLimiter) beforeSave() {}
 func (x *DirentCacheLimiter) save(m state.Map) {
 	x.beforeSave()
-	if !state.IsZeroValue(x.count) {
-		m.Failf("count is %v, expected zero", x.count)
+	if !state.IsZeroValue(&x.count) {
+		m.Failf("count is %#v, expected zero", &x.count)
 	}
 	m.Save("max", &x.max)
 }
diff --git a/pkg/sentry/fs/host/host_state_autogen.go b/pkg/sentry/fs/host/host_state_autogen.go
index 8351ece3b..a6b97a154 100755
--- a/pkg/sentry/fs/host/host_state_autogen.go
+++ b/pkg/sentry/fs/host/host_state_autogen.go
@@ -56,8 +56,8 @@ func (x *inodeOperations) load(m state.Map) {
 func (x *inodeFileState) beforeSave() {}
 func (x *inodeFileState) save(m state.Map) {
 	x.beforeSave()
-	if !state.IsZeroValue(x.queue) {
-		m.Failf("queue is %v, expected zero", x.queue)
+	if !state.IsZeroValue(&x.queue) {
+		m.Failf("queue is %#v, expected zero", &x.queue)
 	}
 	m.Save("descriptor", &x.descriptor)
 	m.Save("sattr", &x.sattr)
diff --git a/pkg/sentry/fs/lock/lock_state_autogen.go b/pkg/sentry/fs/lock/lock_state_autogen.go
index aabf3d570..a5db62814 100755
--- a/pkg/sentry/fs/lock/lock_state_autogen.go
+++ b/pkg/sentry/fs/lock/lock_state_autogen.go
@@ -24,8 +24,8 @@ func (x *Lock) load(m state.Map) {
 func (x *Locks) beforeSave() {}
 func (x *Locks) save(m state.Map) {
 	x.beforeSave()
-	if !state.IsZeroValue(x.blockedQueue) {
-		m.Failf("blockedQueue is %v, expected zero", x.blockedQueue)
+	if !state.IsZeroValue(&x.blockedQueue) {
+		m.Failf("blockedQueue is %#v, expected zero", &x.blockedQueue)
 	}
 	m.Save("locks", &x.locks)
 }
diff --git a/pkg/sentry/fs/proc/sys_net.go b/pkg/sentry/fs/proc/sys_net.go
index d4c4b533d..702fdd392 100644
--- a/pkg/sentry/fs/proc/sys_net.go
+++ b/pkg/sentry/fs/proc/sys_net.go
@@ -80,7 +80,7 @@ func newTCPMemInode(ctx context.Context, msrc *fs.MountSource, s inet.Stack, dir
 }
 
 // Truncate implements fs.InodeOperations.Truncate.
-func (tcpMemInode) Truncate(context.Context, *fs.Inode, int64) error {
+func (*tcpMemInode) Truncate(context.Context, *fs.Inode, int64) error {
 	return nil
 }
 
@@ -196,7 +196,7 @@ func newTCPSackInode(ctx context.Context, msrc *fs.MountSource, s inet.Stack) *f
 }
 
 // Truncate implements fs.InodeOperations.Truncate.
-func (tcpSack) Truncate(context.Context, *fs.Inode, int64) error {
+func (*tcpSack) Truncate(context.Context, *fs.Inode, int64) error {
 	return nil
 }
 
diff --git a/pkg/sentry/fs/timerfd/timerfd_state_autogen.go b/pkg/sentry/fs/timerfd/timerfd_state_autogen.go
index b1335d3c7..955cf1d38 100755
--- a/pkg/sentry/fs/timerfd/timerfd_state_autogen.go
+++ b/pkg/sentry/fs/timerfd/timerfd_state_autogen.go
@@ -9,8 +9,8 @@ import (
 func (x *TimerOperations) beforeSave() {}
 func (x *TimerOperations) save(m state.Map) {
 	x.beforeSave()
-	if !state.IsZeroValue(x.events) {
-		m.Failf("events is %v, expected zero", x.events)
+	if !state.IsZeroValue(&x.events) {
+		m.Failf("events is %#v, expected zero", &x.events)
 	}
 	m.Save("timer", &x.timer)
 	m.Save("val", &x.val)
diff --git a/pkg/sentry/fs/tty/tty_state_autogen.go b/pkg/sentry/fs/tty/tty_state_autogen.go
index 9963096dd..25d601072 100755
--- a/pkg/sentry/fs/tty/tty_state_autogen.go
+++ b/pkg/sentry/fs/tty/tty_state_autogen.go
@@ -61,11 +61,11 @@ func (x *superOperations) load(m state.Map) {
 func (x *lineDiscipline) beforeSave() {}
 func (x *lineDiscipline) save(m state.Map) {
 	x.beforeSave()
-	if !state.IsZeroValue(x.masterWaiter) {
-		m.Failf("masterWaiter is %v, expected zero", x.masterWaiter)
+	if !state.IsZeroValue(&x.masterWaiter) {
+		m.Failf("masterWaiter is %#v, expected zero", &x.masterWaiter)
 	}
-	if !state.IsZeroValue(x.slaveWaiter) {
-		m.Failf("slaveWaiter is %v, expected zero", x.slaveWaiter)
+	if !state.IsZeroValue(&x.slaveWaiter) {
+		m.Failf("slaveWaiter is %#v, expected zero", &x.slaveWaiter)
 	}
 	m.Save("size", &x.size)
 	m.Save("inQueue", &x.inQueue)