Merge release-20200211.0-20-ge4c7f3e (automated)

1 files changed, 162 insertions, 0 deletions

diff --git a/pkg/sentry/vfs/vfs_state_autogen.go b/pkg/sentry/vfs/vfs_state_autogen.go
index 3f14d460c..243646328 100755
--- a/pkg/sentry/vfs/vfs_state_autogen.go
+++ b/pkg/sentry/vfs/vfs_state_autogen.go
@@ -9,6 +9,51 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
+func (x *Dentry) beforeSave() {}
+func (x *Dentry) save(m state.Map) {
+	x.beforeSave()
+	m.Save("parent", &x.parent)
+	m.Save("name", &x.name)
+	m.Save("flags", &x.flags)
+	m.Save("mounts", &x.mounts)
+	m.Save("children", &x.children)
+	m.Save("impl", &x.impl)
+}
+
+func (x *Dentry) afterLoad() {}
+func (x *Dentry) load(m state.Map) {
+	m.Load("parent", &x.parent)
+	m.Load("name", &x.name)
+	m.Load("flags", &x.flags)
+	m.Load("mounts", &x.mounts)
+	m.Load("children", &x.children)
+	m.Load("impl", &x.impl)
+}
+
+func (x *registeredDevice) beforeSave() {}
+func (x *registeredDevice) save(m state.Map) {
+	x.beforeSave()
+	m.Save("dev", &x.dev)
+	m.Save("opts", &x.opts)
+}
+
+func (x *registeredDevice) afterLoad() {}
+func (x *registeredDevice) load(m state.Map) {
+	m.Load("dev", &x.dev)
+	m.Load("opts", &x.opts)
+}
+
+func (x *RegisterDeviceOptions) beforeSave() {}
+func (x *RegisterDeviceOptions) save(m state.Map) {
+	x.beforeSave()
+	m.Save("GroupName", &x.GroupName)
+}
+
+func (x *RegisterDeviceOptions) afterLoad() {}
+func (x *RegisterDeviceOptions) load(m state.Map) {
+	m.Load("GroupName", &x.GroupName)
+}
+
 func (x *epollInterestList) beforeSave() {}
 func (x *epollInterestList) save(m state.Map) {
 	x.beforeSave()
@@ -35,6 +80,114 @@ func (x *epollInterestEntry) load(m state.Map) {
 	m.Load("prev", &x.prev)
 }
 
+func (x *Filesystem) beforeSave() {}
+func (x *Filesystem) save(m state.Map) {
+	x.beforeSave()
+	m.Save("refs", &x.refs)
+	m.Save("vfs", &x.vfs)
+	m.Save("impl", &x.impl)
+}
+
+func (x *Filesystem) afterLoad() {}
+func (x *Filesystem) load(m state.Map) {
+	m.Load("refs", &x.refs)
+	m.Load("vfs", &x.vfs)
+	m.Load("impl", &x.impl)
+}
+
+func (x *registeredFilesystemType) beforeSave() {}
+func (x *registeredFilesystemType) save(m state.Map) {
+	x.beforeSave()
+	m.Save("fsType", &x.fsType)
+	m.Save("opts", &x.opts)
+}
+
+func (x *registeredFilesystemType) afterLoad() {}
+func (x *registeredFilesystemType) load(m state.Map) {
+	m.Load("fsType", &x.fsType)
+	m.Load("opts", &x.opts)
+}
+
+func (x *Mount) beforeSave() {}
+func (x *Mount) save(m state.Map) {
+	x.beforeSave()
+	m.Save("vfs", &x.vfs)
+	m.Save("fs", &x.fs)
+	m.Save("root", &x.root)
+	m.Save("key", &x.key)
+	m.Save("ns", &x.ns)
+	m.Save("refs", &x.refs)
+	m.Save("children", &x.children)
+	m.Save("umounted", &x.umounted)
+	m.Save("writers", &x.writers)
+}
+
+func (x *Mount) afterLoad() {}
+func (x *Mount) load(m state.Map) {
+	m.Load("vfs", &x.vfs)
+	m.Load("fs", &x.fs)
+	m.Load("root", &x.root)
+	m.Load("key", &x.key)
+	m.Load("ns", &x.ns)
+	m.Load("refs", &x.refs)
+	m.Load("children", &x.children)
+	m.Load("umounted", &x.umounted)
+	m.Load("writers", &x.writers)
+}
+
+func (x *MountNamespace) beforeSave() {}
+func (x *MountNamespace) save(m state.Map) {
+	x.beforeSave()
+	m.Save("root", &x.root)
+	m.Save("refs", &x.refs)
+	m.Save("mountpoints", &x.mountpoints)
+}
+
+func (x *MountNamespace) afterLoad() {}
+func (x *MountNamespace) load(m state.Map) {
+	m.Load("root", &x.root)
+	m.Load("refs", &x.refs)
+	m.Load("mountpoints", &x.mountpoints)
+}
+
+func (x *mountTable) beforeSave() {}
+func (x *mountTable) save(m state.Map) {
+	x.beforeSave()
+	m.Save("seed", &x.seed)
+	m.Save("size", &x.size)
+}
+
+func (x *mountTable) afterLoad() {}
+func (x *mountTable) load(m state.Map) {
+	m.Load("seed", &x.seed)
+	m.Load("size", &x.size)
+}
+
+func (x *VirtualFilesystem) beforeSave() {}
+func (x *VirtualFilesystem) save(m state.Map) {
+	x.beforeSave()
+	m.Save("mounts", &x.mounts)
+	m.Save("mountpoints", &x.mountpoints)
+	m.Save("anonMount", &x.anonMount)
+	m.Save("devices", &x.devices)
+	m.Save("anonBlockDevMinorNext", &x.anonBlockDevMinorNext)
+	m.Save("anonBlockDevMinor", &x.anonBlockDevMinor)
+	m.Save("fsTypes", &x.fsTypes)
+	m.Save("filesystems", &x.filesystems)
+}
+
+func (x *VirtualFilesystem) afterLoad() {}
+func (x *VirtualFilesystem) load(m state.Map) {
+	m.Load("mounts", &x.mounts)
+	m.Load("mountpoints", &x.mountpoints)
+	m.Load("anonMount", &x.anonMount)
+	m.Load("devices", &x.devices)
+	m.Load("anonBlockDevMinorNext", &x.anonBlockDevMinorNext)
+	m.Load("anonBlockDevMinor", &x.anonBlockDevMinor)
+	m.Load("fsTypes", &x.fsTypes)
+	m.Load("filesystems", &x.filesystems)
+}
+
 func (x *VirtualDentry) beforeSave() {}
 func (x *VirtualDentry) save(m state.Map) {
 	x.beforeSave()
@@ -49,7 +202,16 @@ func (x *VirtualDentry) load(m state.Map) {
 }
 
 func init() {
+	state.Register("pkg/sentry/vfs.Dentry", (*Dentry)(nil), state.Fns{Save: (*Dentry).save, Load: (*Dentry).load})
+	state.Register("pkg/sentry/vfs.registeredDevice", (*registeredDevice)(nil), state.Fns{Save: (*registeredDevice).save, Load: (*registeredDevice).load})
+	state.Register("pkg/sentry/vfs.RegisterDeviceOptions", (*RegisterDeviceOptions)(nil), state.Fns{Save: (*RegisterDeviceOptions).save, Load: (*RegisterDeviceOptions).load})
 	state.Register("pkg/sentry/vfs.epollInterestList", (*epollInterestList)(nil), state.Fns{Save: (*epollInterestList).save, Load: (*epollInterestList).load})
 	state.Register("pkg/sentry/vfs.epollInterestEntry", (*epollInterestEntry)(nil), state.Fns{Save: (*epollInterestEntry).save, Load: (*epollInterestEntry).load})
+	state.Register("pkg/sentry/vfs.Filesystem", (*Filesystem)(nil), state.Fns{Save: (*Filesystem).save, Load: (*Filesystem).load})
+	state.Register("pkg/sentry/vfs.registeredFilesystemType", (*registeredFilesystemType)(nil), state.Fns{Save: (*registeredFilesystemType).save, Load: (*registeredFilesystemType).load})
+	state.Register("pkg/sentry/vfs.Mount", (*Mount)(nil), state.Fns{Save: (*Mount).save, Load: (*Mount).load})
+	state.Register("pkg/sentry/vfs.MountNamespace", (*MountNamespace)(nil), state.Fns{Save: (*MountNamespace).save, Load: (*MountNamespace).load})
+	state.Register("pkg/sentry/vfs.mountTable", (*mountTable)(nil), state.Fns{Save: (*mountTable).save, Load: (*mountTable).load})
+	state.Register("pkg/sentry/vfs.VirtualFilesystem", (*VirtualFilesystem)(nil), state.Fns{Save: (*VirtualFilesystem).save, Load: (*VirtualFilesystem).load})
 	state.Register("pkg/sentry/vfs.VirtualDentry", (*VirtualDentry)(nil), state.Fns{Save: (*VirtualDentry).save, Load: (*VirtualDentry).load})
 }