diff options
author | gVisor bot <gvisor-bot@google.com> | 2021-06-17 21:06:14 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-06-17 21:06:14 +0000 |
commit | 4dedf67521fd0931c47bcdd7186150eb58dd1185 (patch) | |
tree | 6d71a624b66005ff4a5e11ca5e2e5fa31788f557 /pkg/sentry/state | |
parent | de4e4be19d25554a51d96789f119d06c8e66d096 (diff) | |
parent | 3cf1644a3b4266979b7dda8b6291edf19264fa19 (diff) |
Merge release-20210607.0-54-g3cf1644a3 (automated)
Diffstat (limited to 'pkg/sentry/state')
-rw-r--r-- | pkg/sentry/state/state.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/state/state.go b/pkg/sentry/state/state.go index 167754537..2f0aba4e2 100644 --- a/pkg/sentry/state/state.go +++ b/pkg/sentry/state/state.go @@ -110,7 +110,7 @@ type LoadOpts struct { } // Load loads the given kernel, setting the provided platform and stack. -func (opts LoadOpts) Load(ctx context.Context, k *kernel.Kernel, n inet.Stack, clocks time.Clocks, vfsOpts *vfs.CompleteRestoreOptions) error { +func (opts LoadOpts) Load(ctx context.Context, k *kernel.Kernel, timeReady chan struct{}, n inet.Stack, clocks time.Clocks, vfsOpts *vfs.CompleteRestoreOptions) error { // Open the file. r, m, err := statefile.NewReader(opts.Source, opts.Key) if err != nil { @@ -120,5 +120,5 @@ func (opts LoadOpts) Load(ctx context.Context, k *kernel.Kernel, n inet.Stack, c previousMetadata = m // Restore the Kernel object graph. - return k.LoadFrom(ctx, r, n, clocks, vfsOpts) + return k.LoadFrom(ctx, r, timeReady, n, clocks, vfsOpts) } |