Merge commit '8b6ff18400dc6ba269e8146097af26b5f0859eee'

Author: xen-git

ocaml/idl/datamodel.ml

@@ -781,6 +781,14 @@ let _ =
     ~doc:"VM cannot be started because it requires a VDI which cannot be attached" ();
   error Api_errors.vm_migrate_failed [ "vm"; "source"; "destination"; "msg" ]
     ~doc:"An error occurred during the migration process." ();
+  error Api_errors.vm_has_too_many_snapshots [ "vm" ]
+    ~doc:"You attempted to migrate a VM with more than one snapshot." ();
+  error Api_errors.vdi_needs_vm_for_migrate [ "vdi" ]
+    ~doc:"You attempted to migrate a VDI which is not attached to a runnning VM." ();
+  error Api_errors.mirror_failed [ "vdi" ]
+    ~doc:"The VDI mirroring cannot be performed" ();
+  error Api_errors.too_many_storage_migrates [ "number" ]
+    ~doc:"You reached the maximal number of concurrently migrating VMs." ();
   error Api_errors.vm_failed_shutdown_ack []
     ~doc:"VM didn't acknowledge the need to shutdown." ();
   error Api_errors.vm_shutdown_timeout [ "vm"; "timeout" ]

ocaml/xapi/message_forwarding.ml

@@ -3268,11 +3268,11 @@ module Forward = functor(Local: Custom_actions.CUSTOM_ACTIONS) -> struct
 			let vbds = Db.VBD.get_records_where ~__context
 				~expr:(Db_filter_types.Eq(Db_filter_types.Field "VDI", Db_filter_types.Literal (Ref.string_of vdi))) in
 			let vbds = List.filter (fun (_,vbd) -> vbd.API.vBD_currently_attached) vbds in
-			if List.length vbds <> 1 then raise (Api_errors.Server_error(Api_errors.vdi_needs_vm_for_migrate,[]));
+			if List.length vbds <> 1 then raise (Api_errors.Server_error(Api_errors.vdi_needs_vm_for_migrate,[Ref.string_of vdi]));
 
 			let vm = (snd (List.hd vbds)).API.vBD_VM in
 			let vmr = Db.VM.get_record ~__context ~self:vm in
-			if vmr.API.vM_power_state <> `Running then raise (Api_errors.Server_error(Api_errors.vdi_needs_vm_for_migrate,[]));
+			if vmr.API.vM_power_state <> `Running then raise (Api_errors.Server_error(Api_errors.vdi_needs_vm_for_migrate,[Ref.string_of vdi]));
 			let host = vmr.API.vM_resident_on in
 			(* hackity hack *)
 			let options = ("__internal__vm",Ref.string_of vm) :: (List.remove_assoc "__internal__vm" options) in

ocaml/xapi/xapi_vm_migrate.ml

@@ -188,7 +188,7 @@ let migrate_send'  ~__context ~vm ~dest ~live ~vdi_map ~vif_map ~options =
 	let (snapshots_vbds,nb_snapshots) = get_snapshots_vbds ~__context ~vm in
 	debug "get_snapshots VMs %d VBDs %d" nb_snapshots (List.length snapshots_vbds);
 	if nb_snapshots > 1 then
-		raise (Api_errors.Server_error(Api_errors.vm_has_too_many_snapshots, []));
+		raise (Api_errors.Server_error(Api_errors.vm_has_too_many_snapshots, [Ref.string_of vm]));
 	let vdi_filter snapshot vbd =
 		if not(Db.VBD.get_empty ~__context ~self:vbd)
 		then
@@ -550,7 +550,7 @@ let assert_can_migrate  ~__context ~vm ~dest ~live ~vdi_map ~vif_map ~options =
 		(* Check that the VM has no more than one snapshot *)
 		let (snapshots_vbds, nb_snapshots) = get_snapshots_vbds ~__context ~vm in
 		if nb_snapshots > 1 then
-			raise (Api_errors.Server_error(Api_errors.vm_has_too_many_snapshots, []));
+			raise (Api_errors.Server_error(Api_errors.vm_has_too_many_snapshots, [Ref.string_of vm]));
 		(* Ignore vdi_map for now since we won't be doing any mirroring. *)
 		inter_pool_metadata_transfer ~__context ~remote_rpc ~session_id ~remote_address ~vm ~vdi_map:[] ~dry_run:true ~live