From 052eb90dc15e04dfd8397ca305c507399360dd0e Mon Sep 17 00:00:00 2001
From: Jamie Liu <jamieliu@google.com>
Date: Thu, 8 Jul 2021 13:36:49 -0700
Subject: Replace kernel.ExitStatus with linux.WaitStatus.

PiperOrigin-RevId: 383705129
---
 pkg/sentry/control/proc.go  | 2 +-
 pkg/sentry/control/state.go | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkg/sentry/control')

diff --git a/pkg/sentry/control/proc.go b/pkg/sentry/control/proc.go
index 221e98a01..b7ee5425d 100644
--- a/pkg/sentry/control/proc.go
+++ b/pkg/sentry/control/proc.go
@@ -126,7 +126,7 @@ func (proc *Proc) Exec(args *ExecArgs, waitStatus *uint32) error {
 
 	// Wait for completion.
 	newTG.WaitExited()
-	*waitStatus = newTG.ExitStatus().Status()
+	*waitStatus = uint32(newTG.ExitStatus())
 	return nil
 }
 
diff --git a/pkg/sentry/control/state.go b/pkg/sentry/control/state.go
index 62eaca965..4c83b8e8e 100644
--- a/pkg/sentry/control/state.go
+++ b/pkg/sentry/control/state.go
@@ -17,6 +17,7 @@ package control
 import (
 	"errors"
 
+	"gvisor.dev/gvisor/pkg/abi/linux"
 	"gvisor.dev/gvisor/pkg/log"
 	"gvisor.dev/gvisor/pkg/sentry/kernel"
 	"gvisor.dev/gvisor/pkg/sentry/state"
@@ -67,7 +68,7 @@ func (s *State) Save(o *SaveOpts, _ *struct{}) error {
 				log.Warningf("Save failed: exiting...")
 				s.Kernel.SetSaveError(err)
 			}
-			s.Kernel.Kill(kernel.ExitStatus{})
+			s.Kernel.Kill(linux.WaitStatusExit(0))
 		},
 	}
 	return saveOpts.Save(s.Kernel.SupervisorContext(), s.Kernel, s.Watchdog)
-- 
cgit v1.2.3