Merge pull request #5519 from freddy77/cleanups

xapi-project · Mar 18, 2024 · 9fcfbfc · 9fcfbfc
2 parents 714d995 + 4f9513e
commit 9fcfbfc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/ocaml/forkexecd/lib/fe.ml b/ocaml/forkexecd/lib/fe.ml
@@ -20,11 +20,9 @@ type process_result = WEXITED of int | WSIGNALED of int | WSTOPPED of int
 type ferpc =
   | Setup of setup_cmd
   | Setup_response of setup_response
-  | Cancel
   | Exec
   | Execed of int
   | Finished of process_result
-  | Log_reopen
   | Dontwaitpid
 [@@deriving rpc]
 

diff --git a/ocaml/forkexecd/src/child.ml b/ocaml/forkexecd/src/child.ml
@@ -49,8 +49,6 @@ let handle_fd_sock fd_sock state =
 let handle_comms_sock comms_sock state =
   let call = Fecomms.read_raw_rpc comms_sock in
   match call with
-  | Ok Fe.Cancel ->
-      debug "Cancel" ; raise Cancelled
   | Ok Fe.Exec ->
       debug "Exec" ;
       {state with finished= true}