diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-06-10 08:05:12 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-10 08:05:12 +0000 |
| commit | 0eba475c75871c21aac849203c3f344dc84f5790 (patch) | |
| tree | 9eb44283b7d8c6b054bbaa1cb9c56effc2190704 /pkg/sentry/arch/arch.go | |
| parent | b6d9ec9af725a7b070e7d476692074f8904ddebe (diff) | |
| parent | a51fcf22ebe522c028e99692bbedf04daf0436cc (diff) | |
Merge release-20210601.0-34-ga51fcf22e (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 9db228bab..d765d8374 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) - // NewSignalStack returns a new object that is equivalent to stack_t in the - // guest architecture. - NewSignalStack() NativeSignalStack - // SignalSetup modifies the context in preparation for handling the // given signal. // @@ -153,7 +149,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 *linux.SigAction, info *SignalInfo, alt *SignalStack, sigset linux.SignalSet) error + SignalSetup(st *Stack, act *linux.SigAction, info *SignalInfo, alt *linux.SignalStack, sigset linux.SignalSet) error // SignalRestore restores context after returning from a signal // handler. @@ -163,7 +159,7 @@ type Context interface { // rt is true if SignalRestore is being entered from rt_sigreturn and // false if SignalRestore is being entered from sigreturn. // SignalRestore returns the thread's new signal mask. - SignalRestore(st *Stack, rt bool) (linux.SignalSet, SignalStack, error) + SignalRestore(st *Stack, rt bool) (linux.SignalSet, linux.SignalStack, error) // CPUIDEmulate emulates a CPUID instruction according to current register state. CPUIDEmulate(l log.Logger) |