xapi_ha_vm_failover: remove superfluous debug message

It didn't add any useful information to the error. Also cleaned up the
formatting of some comments found during the patch series.

Signed-off-by: Pau Ruiz Safont <[email protected]>

Author: psafont

ocaml/xapi/xapi_ha_vm_failover.ml

@@ -1223,9 +1223,6 @@ let assert_configuration_change_preserves_ha_plan ~__context c =
             "assert_configuration_change_preserves_ha_plan: plan exists after \
              change"
       | Plan_exists_excluding_non_agile_VMs | No_plan_exists ->
-          debug
-            "assert_configuration_change_preserves_ha_plan: proposed change \
-             breaks plan" ;
           raise
             (Api_errors.Server_error
                (Api_errors.ha_operation_would_break_failover_plan, [])
@@ -1413,8 +1410,9 @@ let restart_auto_run_vms ~__context ~last_live_set ~live_set n =
   let open TaskChains.Infix in
   (* execute the plan *)
   Helpers.call_api_functions ~__context (fun rpc session_id ->
-      (* Helper function to start a VM somewhere. If the HA overcommit protection stops us then disable it and try once more.
-         			   Returns true if the VM was restarted and false otherwise. *)
+      (* Helper function to start a VM somewhere. If the HA overcommit
+         protection stops us then disable it and try once more. Returns true if
+         the VM was restarted and false otherwise. *)
       let restart_vm vm ?host () =
         let go () =
           ( if Xapi_fist.simulate_restart_failure () then
@@ -1579,10 +1577,11 @@ let restart_auto_run_vms ~__context ~last_live_set ~live_set n =
       in
       gc_table last_start_attempt ;
       gc_table restart_failed ;
-      (* Consider restarting the best-effort VMs we *think* have failed (but we might get this wrong --
-         			   ok since this is 'best-effort'). NOTE we do not use the restart_vm function above as this will mark the
-         			   pool as overcommitted if an HA_OPERATION_WOULD_BREAK_FAILOVER_PLAN is received (although this should never
-         			   happen it's better safe than sorry) *)
+      (* Consider restarting the best-effort VMs we *think* have failed (but we
+         might get this wrong -- ok since this is 'best-effort'). NOTE we do
+         not use the restart_vm function above as this will mark the pool as
+         overcommitted if an HA_OPERATION_WOULD_BREAK_FAILOVER_PLAN is received
+         (although this should never happen it's better safe than sorry) *)
       let is_best_effort r =
         r.API.vM_ha_restart_priority = Constants.ha_restart_best_effort
         && r.API.vM_power_state = `Halted

ocaml/xapi/xapi_vif_helpers.ml

@@ -290,8 +290,7 @@ let create ~__context ~device ~network ~vM ~mAC ~mTU ~other_config
       in
       let new_device = int_of_string device in
       if List.exists (fun (_, d) -> d = new_device) all_vifs_with_devices then
-        raise
-          (Api_errors.Server_error (Api_errors.device_already_exists, [device])) ;
+        raise Api_errors.(Server_error (device_already_exists, [device])) ;
 
       (* If the VM uses a PVS_proxy, then the proxy _must_ be associated with
          the VIF that has the lowest device number. Check that the new VIF