Merge pull request #2726 from robhoes/memory2

Fix memory setting issues

Author: robhoes

ocaml/xapi/create_misc.ml

@@ -331,8 +331,16 @@ and create_domain_zero_guest_metrics_record ~__context ~domain_zero_metrics_ref
 and update_domain_zero_record ~__context ~domain_zero_ref (host_info: host_info) : unit =
 	(* Write the updated memory constraints to the database, if the VM is not
 	   marked as requiring reboot. *)
+	let constraints_in_db = Vm_memory_constraints.get ~__context ~vm_ref:domain_zero_ref in
 	let constraints = create_domain_zero_memory_constraints host_info in
 	if not (Xapi_host_helpers.Host_requires_reboot.get ()) then begin
+		let constraints =
+			(* Only update static_min if it is unset (i.e. 0) *)
+			if constraints_in_db.static_min > 0L then
+				{constraints with static_min = constraints_in_db.static_min}
+			else
+				constraints
+		in
 		Vm_memory_constraints.set ~__context ~vm_ref:domain_zero_ref ~constraints;
 		Db.VM.set_requires_reboot ~__context ~self:domain_zero_ref ~value:false
 	end;

ocaml/xapi/message_forwarding.ml

@@ -793,9 +793,11 @@ module Forward = functor(Local: Custom_actions.CUSTOM_ACTIONS) -> struct
 
 		(* Read resisdent-on field from vm to determine who to forward to  *)
 		let forward_vm_op ~local_fn ~__context ~vm op =
-			Xapi_vm_lifecycle.assert_power_state_in ~__context ~self:vm
-				~allowed:[`Running; `Paused];
-			do_op_on ~local_fn ~__context ~host:(Db.VM.get_resident_on ~__context ~self:vm) op
+			let power_state = Db.VM.get_power_state ~__context ~self:vm in
+			if List.mem power_state [`Running; `Paused] then
+				do_op_on ~local_fn ~__context ~host:(Db.VM.get_resident_on ~__context ~self:vm) op
+			else
+				local_fn ~__context
 
 		(* Clear scheduled_to_be_resident_on for a VM and all its vGPUs. *)
 		let clear_scheduled_to_be_resident_on ~__context ~vm =