Remove some unnecessary debug statements left in by accident and fix an annoying...

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/ocaml/xapi/storage_access.ml b/ocaml/xapi/storage_access.ml
index a23a9ec2acc2404c19e3bf13fe647f7bf6b38097..f3ee0d3c2fe8a7c48804d1a399c4495426c8f172 100644 (file)
--- a/ocaml/xapi/storage_access.ml
+++ b/ocaml/xapi/storage_access.ml
@@ -223,7 +223,6 @@ module VDI =
       (fun () ->
         if (check_enclosing_sr_for_capability __context Smint.Vdi_activate self) then
           begin
-                  if mode=`RW then debug "foo";
             Sm.call_sm_vdi_functions ~__context ~vdi:self
               (fun device_config sr_type sr ->
                  Sm.vdi_activate device_config sr_type sr self (mode = `RW));
@@ -242,7 +241,7 @@ module VDI =
 
             (* CA-15824: we decrement refcount whether or not deactivate call is succesful *)
             ignore (decrement_activate_refcount self); (* caps at 0 *)
-            debug "Considering execute deactive on VDI '%s'; activate refcount now: %d" (Ref.string_of self) activate_refcount;
+            debug "Considering execute deactivate on VDI '%s'; activate refcount now: %d" (Ref.string_of self) activate_refcount;
             if activate_refcount<=1 then (* do deactivate on 1->0 transition, but also allow detach through if we're already at 0.. *) 
               begin
                 if activate_refcount<1 then

diff --git a/ocaml/xapi/xapi_vm_lifecycle.ml b/ocaml/xapi/xapi_vm_lifecycle.ml
index 8f831a8d8aa607e8a017a1982d7cbe0d33b675aa..06f8ed4518869af2e54fdfc9cd7c84361c6ca25b 100644 (file)
--- a/ocaml/xapi/xapi_vm_lifecycle.ml
+++ b/ocaml/xapi/xapi_vm_lifecycle.ml
@@ -204,8 +204,6 @@ let report_concurrent_operations_error ~current_ops ~ref_str =
 (** Take an internal VM record and a proposed operation, return true if the operation
     would be acceptable *)
 let check_operation_error ~vmr ~vmgmr ~ref ~clone_suspended_vm_enabled vdis_reset_and_caching ~op =
-       debug "Check operation error: op=%s" (Record_util.vm_operation_to_string op);
-       debug "vdis_reset_and_caching: [%s]" (String.concat ";" (List.map (fun (a,b) -> (Printf.sprintf "(%b,%b)" a b)) vdis_reset_and_caching));
        let ref_str = Ref.string_of ref in
        let power_state = vmr.Db_actions.vM_power_state in
        let current_ops = vmr.Db_actions.vM_current_operations in