# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1260486287 0
# Node ID 43f67984ff0f3737bc3c041325446ec5fcd27a6e
# Parent  1f49f00797faf725de371513be573e0ca0badb26
CA-33707: Stop using the internal RPC call VM.hard_reboot_internal in the event thread VM reboot path. This used to be necessary when memory settings could change across reboot but ever since the integration of DMC this is nolonger possible. Removing this simplifies the start/reboot locking.

Note we leave the forwarding code in place to cope with rolling upgrade to the next release.

Signed-off-by: David Scott <dave.scott@xxxxxxxxxxxxx>

diff -r 1f49f00797fa -r 43f67984ff0f ocaml/idl/datamodel.ml
--- a/ocaml/idl/datamodel.ml	Fri Dec 04 16:04:36 2009 +0000
+++ b/ocaml/idl/datamodel.ml	Thu Dec 10 23:04:47 2009 +0000
@@ -1590,6 +1590,7 @@
   ~params:[Ref _vm, "vm", "The VM to reboot"]
   ~pool_internal:true
   ~hide_from_docs:true
+  ~internal_deprecated_since:rel_midnight_ride
   ~allowed_roles:_R_LOCAL_ROOT_ONLY
   ()
   
diff -r 1f49f00797fa -r 43f67984ff0f ocaml/xapi/events.ml
--- a/ocaml/xapi/events.ml	Fri Dec 04 16:04:36 2009 +0000
+++ b/ocaml/xapi/events.ml	Thu Dec 10 23:04:47 2009 +0000
@@ -143,7 +143,8 @@
     else clear_reboot_delay ~__context ~vm;
 
     try
-      Helpers.call_api_functions ~__context (fun rpc session_id -> Client.Client.VM.hard_reboot_internal rpc session_id vm)
+	  Xapi_vm.Reboot.in_dom0_already_locked { Xapi_vm.TwoPhase.__context = __context; vm=vm; api_call_name="reboot"; clean=false };
+	  update_allowed_ops_using_api ~__context vm
     with e ->
       (* NB this can happen if the user has change the VM configuration to onw which
 	 cannot boot (eg not enough memory) and then rebooted inside the guest *)