diff options
author | Ayush Ranjan <ayushranjan@google.com> | 2021-06-09 22:51:28 -0700 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-06-09 22:53:41 -0700 |
commit | 8d87a9418aacc175d7a2fa3583f40988e05946cc (patch) | |
tree | 87e595b78ec384a7e21f67d5a7cc776b176c20a0 /pkg/sentry/arch/arch.go | |
parent | 8a7b5a4a8188157a99e5f7654f9235c5332b3552 (diff) |
[op] Move SignalAct to abi/linux package.
There were also other duplicate definitions of the same struct that I have now
removed.
Updates #214
PiperOrigin-RevId: 378579954
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. |