diff options
| author | Tamir Duberstein <tamird@google.com> | 2021-06-17 13:59:51 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-17 14:02:05 -0700 |
| commit | 3cf1644a3b4266979b7dda8b6291edf19264fa19 (patch) | |
| tree | 3b8d0ff887cb953409618b1e4b4d41342520e15c /pkg/sentry/state | |
| parent | 0f5c1f5eafb2cc67a9148bdf346b6083e5a8480c (diff) | |
Move tcpip.Clock impl to Timekeeper
...and pass it explicitly.
This reverts commit b63e61828d0652ad1769db342c17a3529d2d24ed.
PiperOrigin-RevId: 380039167
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) } |