diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-06-10 05:57:41 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-10 05:57:41 +0000 |
| commit | b6d9ec9af725a7b070e7d476692074f8904ddebe (patch) | |
| tree | 1e8983f795d99d486a660729eab6f916e8f142e6 /pkg/sentry/arch/arch.go | |
| parent | bc4d6e685a252dc65a5c108aefe61bff9149dc6a (diff) | |
| parent | 8d87a9418aacc175d7a2fa3583f40988e05946cc (diff) | |
Merge release-20210601.0-33-g8d87a9418 (automated)
Diffstat (limited to 'pkg/sentry/arch/arch.go')
| -rw-r--r-- | pkg/sentry/arch/arch.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkg/sentry/arch/arch.go b/pkg/sentry/arch/arch.go index 290863ee6..9db228bab 100644 --- a/pkg/sentry/arch/arch.go +++ b/pkg/sentry/arch/arch.go @@ -134,10 +134,6 @@ type Context interface { // RegisterMap returns a map of all registers. RegisterMap() (map[string]uintptr, error) - // NewSignalAct returns a new object that is equivalent to struct sigaction - // in the guest architecture. - NewSignalAct() NativeSignalAct - // NewSignalStack returns a new object that is equivalent to stack_t in the // guest architecture. NewSignalStack() NativeSignalStack @@ -148,7 +144,7 @@ type Context interface { // st is the stack where the signal handler frame should be // constructed. // - // act is the SignalAct that specifies how this signal is being + // act is the SigAction that specifies how this signal is being // handled. // // info is the SignalInfo of the signal being delivered. @@ -157,7 +153,7 @@ type Context interface { // stack is not going to be used). // // sigset is the signal mask before entering the signal handler. - SignalSetup(st *Stack, act *SignalAct, info *SignalInfo, alt *SignalStack, sigset linux.SignalSet) error + SignalSetup(st *Stack, act *linux.SigAction, info *SignalInfo, alt *SignalStack, sigset linux.SignalSet) error // SignalRestore restores context after returning from a signal // handler. |