CA-48062 xapi hook "vm-pre-start"

Signed-off-by: James Bulpin <James.Bulpin@eu.citrix.com>

diff --git a/ocaml/xapi/xapi_hooks.ml b/ocaml/xapi/xapi_hooks.ml
index 89901a682c079c5572323501c9d55a91765911d9..bfb6d96ba60777c024cdea8c7d7c1cfa49764e36 100644 (file)
--- a/ocaml/xapi/xapi_hooks.ml
+++ b/ocaml/xapi/xapi_hooks.ml
@@ -17,6 +17,7 @@ open D
 (* Names of VM script hooks *)
 let scriptname__vm_pre_destroy  = "vm-pre-shutdown"
 let scriptname__vm_pre_migrate  = "vm-pre-migrate"
+let scriptname__vm_pre_start    = "vm-pre-start"
 
 (* VM Script hook reason codes *)
 let reason__clean_shutdown = "clean-shutdown"
@@ -91,6 +92,8 @@ let vm_pre_destroy ~__context ~reason ~vm =
   execute_vm_hook ~__context ~script_name:scriptname__vm_pre_destroy ~reason ~vm
 let vm_pre_migrate ~__context ~reason ~vm =
   execute_vm_hook ~__context ~script_name:scriptname__vm_pre_migrate ~reason ~vm
+let vm_pre_start ~__context ~reason ~vm =
+  execute_vm_hook ~__context ~script_name:scriptname__vm_pre_start ~reason ~vm
 
 let host_pre_declare_dead ~__context ~host ~reason = 
   execute_host_hook ~__context ~script_name:scriptname__host_pre_declare_dead ~reason ~host

diff --git a/ocaml/xapi/xapi_vm.ml b/ocaml/xapi/xapi_vm.ml
index b0bf819efec4a87c80700ee7700ea4e5531b6b37..077beda881e503335533b7f41f631262c4dae954 100644 (file)
--- a/ocaml/xapi/xapi_vm.ml
+++ b/ocaml/xapi/xapi_vm.ml
@@ -535,6 +535,9 @@ module Shutdown = struct
                  )
        end;
 
+       (* Invoke pre-start hook *)
+       Xapi_hooks.vm_pre_start ~__context ~reason:Xapi_hooks.reason__none ~vm;
+
     if Db.VM.get_power_state ~__context ~self:vm = `Suspended then begin
       debug "hard_shutdown: destroying any suspend VDI";