Merge pull request #205 from robur-coop/fix-restart

Make restart command actually kill first
robur-coop · Feb 4, 2025 · d93daf3 · d93daf3
2 parents 5b14787 + b0e78de
commit d93daf3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Use OCaml ${{ matrix.ocaml-version }}
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-version }}
 

diff --git a/src/vmm_vmmd.ml b/src/vmm_vmmd.ml
@@ -375,6 +375,11 @@ let handle_unikernel_cmd t id = function
       match Vmm_resources.find_unikernel t.resources id with
       | None -> stop_create t id
       | Some unikernel ->
+        let* resources = Vmm_resources.remove_unikernel t.resources id in
+        let* () = Vmm_resources.check_unikernel resources id unikernel.Unikernel.config in
+        (match Vmm_unix.destroy unikernel with
+         | exception Unix.Unix_error _ -> ()
+         | () -> ());
         Ok (t, `Wait_and_create (id, (id, unikernel.Unikernel.config)))
     end
   | `Unikernel_destroy ->