Merge release-20200914.0-152-g0a7075f38 (automated)

2 files changed, 29 insertions, 0 deletions

diff --git a/pkg/sentry/devices/ttydev/ttydev.go b/pkg/sentry/devices/ttydev/ttydev.go
index 664e54498..a287c65ca 100644
--- a/pkg/sentry/devices/ttydev/ttydev.go
+++ b/pkg/sentry/devices/ttydev/ttydev.go
@@ -30,6 +30,8 @@ const (
 )
 
 // ttyDevice implements vfs.Device for /dev/tty.
+//
+// +stateify savable
 type ttyDevice struct{}
 
 // Open implements vfs.Device.Open.
diff --git a/pkg/sentry/devices/ttydev/ttydev_state_autogen.go b/pkg/sentry/devices/ttydev/ttydev_state_autogen.go
index 29014107c..9883dcf08 100644
--- a/pkg/sentry/devices/ttydev/ttydev_state_autogen.go
+++ b/pkg/sentry/devices/ttydev/ttydev_state_autogen.go
@@ -1,3 +1,30 @@
 // automatically generated by stateify.
 
 package ttydev
+
+import (
+	"gvisor.dev/gvisor/pkg/state"
+)
+
+func (x *ttyDevice) StateTypeName() string {
+	return "pkg/sentry/devices/ttydev.ttyDevice"
+}
+
+func (x *ttyDevice) StateFields() []string {
+	return []string{}
+}
+
+func (x *ttyDevice) beforeSave() {}
+
+func (x *ttyDevice) StateSave(m state.Sink) {
+	x.beforeSave()
+}
+
+func (x *ttyDevice) afterLoad() {}
+
+func (x *ttyDevice) StateLoad(m state.Source) {
+}
+
+func init() {
+	state.Register((*ttyDevice)(nil))
+}