From: David Scott Date: Wed, 26 Jan 2011 17:39:04 +0000 (+0000) Subject: Remove some unnecessary debug statements left in by accident and fix an annoying... X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cb3fe5f97747107d9d2daf9c55e4a08e16de3691;p=xcp%2Fxen-api.git Remove some unnecessary debug statements left in by accident and fix an annoying spelling mistake in a log message. Signed-off-by: David Scott --- diff --git a/ocaml/xapi/storage_access.ml b/ocaml/xapi/storage_access.ml index a23a9ec2..f3ee0d3c 100644 --- 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 8f831a8d..06f8ed45 100644 --- 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