XSI-1773 clean up swtpm service files

We have seen swtpm systemd service files not being removed. We now call
Fe_systemctl.stop even when the servive is potentially not running to
ensure clean up is happening regardless.

Signed-off-by: Christian Lindig <[email protected]>

Author: Christian Lindig

ocaml/xenopsd/xc/service.ml

@@ -619,15 +619,14 @@ module SystemdDaemonMgmt (D : DAEMONPIDPATH) = struct
     match (of_domid domid, is_running ~xs domid) with
     | None, true ->
         Compat.stop ~xs domid
-    | Some service, true ->
-        (* xenstore cleanup is done by systemd unit file *)
-        let (_ : Fe_systemctl.status) = Fe_systemctl.stop ~service in
-        ()
-    | Some service, false ->
-        info "Not trying to stop %s since it's not running" service
     | None, false ->
         info "Not trying to stop %s for domid %i since it's not running" D.name
           domid
+    | Some service, _ ->
+        (* xenstore cleanup is done by systemd unit file; we are calling
+           stop in any case to clean up *)
+        let (_ : Fe_systemctl.status) = Fe_systemctl.stop ~service in
+        ()
 
   let start_daemon ~path ~args ~domid () =
     debug "Starting daemon: %s with args [%s]" path (String.concat "; " args) ;