diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-06-10 17:30:25 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-10 17:30:25 +0000 |
| commit | 8f51cf9ff011aef0fd03e2e223e2162d818dadeb (patch) | |
| tree | b8555cdfcf33e41476211f73d83fac81c1feea2e /pkg/sentry/platform/kvm/context.go | |
| parent | 87d7d055e7804716b3bd0bbb9b1013a9d1bae38d (diff) | |
| parent | 9ede1a6058131b50340427c8d0fd3a9ccef5e300 (diff) | |
Merge release-20210601.0-39-g9ede1a605 (automated)
Diffstat (limited to 'pkg/sentry/platform/kvm/context.go')
| -rw-r--r-- | pkg/sentry/platform/kvm/context.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkg/sentry/platform/kvm/context.go b/pkg/sentry/platform/kvm/context.go index f4d4473a8..183e741ea 100644 --- a/pkg/sentry/platform/kvm/context.go +++ b/pkg/sentry/platform/kvm/context.go @@ -17,6 +17,7 @@ package kvm import ( "sync/atomic" + "gvisor.dev/gvisor/pkg/abi/linux" pkgcontext "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/hostarch" "gvisor.dev/gvisor/pkg/ring0" @@ -32,15 +33,15 @@ type context struct { // machine is the parent machine, and is immutable. machine *machine - // info is the arch.SignalInfo cached for this context. - info arch.SignalInfo + // info is the linux.SignalInfo cached for this context. + info linux.SignalInfo // interrupt is the interrupt context. interrupt interrupt.Forwarder } // Switch runs the provided context in the given address space. -func (c *context) Switch(ctx pkgcontext.Context, mm platform.MemoryManager, ac arch.Context, _ int32) (*arch.SignalInfo, hostarch.AccessType, error) { +func (c *context) Switch(ctx pkgcontext.Context, mm platform.MemoryManager, ac arch.Context, _ int32) (*linux.SignalInfo, hostarch.AccessType, error) { as := mm.AddressSpace() localAS := as.(*addressSpace) |