diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-08-08 19:42:12 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-08-08 19:42:12 +0000 |
| commit | 3e8a2e033f3e1245d027592aa490d38fbf86f20b (patch) | |
| tree | 858bdde11fe4fb67735253e43635a93afd55c490 /pkg/sentry/state | |
| parent | 4f3f4cd15b73ab00d6423717cf9bfb2b8b709779 (diff) | |
| parent | 13a98df49ea1b36cd21c528293b626a6a3639f0b (diff) | |
Merge 13a98df4 (automated)
Diffstat (limited to 'pkg/sentry/state')
| -rw-r--r-- | pkg/sentry/state/state.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/sentry/state/state.go b/pkg/sentry/state/state.go index 026549756..9eb626b76 100644 --- a/pkg/sentry/state/state.go +++ b/pkg/sentry/state/state.go @@ -22,6 +22,7 @@ import ( "gvisor.dev/gvisor/pkg/log" "gvisor.dev/gvisor/pkg/sentry/inet" "gvisor.dev/gvisor/pkg/sentry/kernel" + "gvisor.dev/gvisor/pkg/sentry/time" "gvisor.dev/gvisor/pkg/sentry/watchdog" "gvisor.dev/gvisor/pkg/state/statefile" "gvisor.dev/gvisor/pkg/syserror" @@ -104,7 +105,7 @@ type LoadOpts struct { } // Load loads the given kernel, setting the provided platform and stack. -func (opts LoadOpts) Load(k *kernel.Kernel, n inet.Stack) error { +func (opts LoadOpts) Load(k *kernel.Kernel, n inet.Stack, clocks time.Clocks) error { // Open the file. r, m, err := statefile.NewReader(opts.Source, opts.Key) if err != nil { @@ -114,5 +115,5 @@ func (opts LoadOpts) Load(k *kernel.Kernel, n inet.Stack) error { previousMetadata = m // Restore the Kernel object graph. - return k.LoadFrom(r, n) + return k.LoadFrom(r, n, clocks) } |