diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-02-11 19:46:42 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-02-11 19:46:42 +0000 |
| commit | b92a60b3669d9f026c3bf8a023347105e0283624 (patch) | |
| tree | 9834cf5339dbe5179b52665a2c1cb3bfa4f4c2bb /pkg/sentry/memmap | |
| parent | 8afbfb1022637fc52a55af35feda0dd79deeb0c4 (diff) | |
| parent | 9be46e55c2aadcf40c9abd4b515c3fe899d9fa08 (diff) | |
Merge release-20200127.0-130-g9be46e5 (automated)
Diffstat (limited to 'pkg/sentry/memmap')
| -rwxr-xr-x | pkg/sentry/memmap/memmap_impl_state_autogen.go | 6 | ||||
| -rwxr-xr-x | pkg/sentry/memmap/memmap_state_autogen.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkg/sentry/memmap/memmap_impl_state_autogen.go b/pkg/sentry/memmap/memmap_impl_state_autogen.go index 53cebac8c..b231fd9c3 100755 --- a/pkg/sentry/memmap/memmap_impl_state_autogen.go +++ b/pkg/sentry/memmap/memmap_impl_state_autogen.go @@ -57,7 +57,7 @@ func (x *MappingSegmentDataSlices) load(m state.Map) { } func init() { - state.Register("memmap.MappingSet", (*MappingSet)(nil), state.Fns{Save: (*MappingSet).save, Load: (*MappingSet).load}) - state.Register("memmap.Mappingnode", (*Mappingnode)(nil), state.Fns{Save: (*Mappingnode).save, Load: (*Mappingnode).load}) - state.Register("memmap.MappingSegmentDataSlices", (*MappingSegmentDataSlices)(nil), state.Fns{Save: (*MappingSegmentDataSlices).save, Load: (*MappingSegmentDataSlices).load}) + state.Register("pkg/sentry/memmap.MappingSet", (*MappingSet)(nil), state.Fns{Save: (*MappingSet).save, Load: (*MappingSet).load}) + state.Register("pkg/sentry/memmap.Mappingnode", (*Mappingnode)(nil), state.Fns{Save: (*Mappingnode).save, Load: (*Mappingnode).load}) + state.Register("pkg/sentry/memmap.MappingSegmentDataSlices", (*MappingSegmentDataSlices)(nil), state.Fns{Save: (*MappingSegmentDataSlices).save, Load: (*MappingSegmentDataSlices).load}) } diff --git a/pkg/sentry/memmap/memmap_state_autogen.go b/pkg/sentry/memmap/memmap_state_autogen.go index 16107f949..2072dbad2 100755 --- a/pkg/sentry/memmap/memmap_state_autogen.go +++ b/pkg/sentry/memmap/memmap_state_autogen.go @@ -35,6 +35,6 @@ func (x *MappingOfRange) load(m state.Map) { } func init() { - state.Register("memmap.MappableRange", (*MappableRange)(nil), state.Fns{Save: (*MappableRange).save, Load: (*MappableRange).load}) - state.Register("memmap.MappingOfRange", (*MappingOfRange)(nil), state.Fns{Save: (*MappingOfRange).save, Load: (*MappingOfRange).load}) + state.Register("pkg/sentry/memmap.MappableRange", (*MappableRange)(nil), state.Fns{Save: (*MappableRange).save, Load: (*MappableRange).load}) + state.Register("pkg/sentry/memmap.MappingOfRange", (*MappingOfRange)(nil), state.Fns{Save: (*MappingOfRange).save, Load: (*MappingOfRange).load}) } |