# HG changeset patch
# User Jonathan Knowles <jonathan.knowles@xxxxxxxxxxxxx>
# Date 1264783112 0
# Node ID bc16f0dccc55a5b4d1f31bc10596aa5e91696a64
# Parent  8f7fbffae087f6a9292de089226977bf9291c7d5
[CA-31705] Improves error handling within vm-memory-target-wait.

Coalesces two memory unit conversions into a single memory unit conversion.

Signed-off-by: Jonathan Knowles <jonathan.knowles@xxxxxxxxxxxxx>

diff -r 8f7fbffae087 -r bc16f0dccc55 ocaml/xapi/xapi_vm_helpers.ml
--- a/ocaml/xapi/xapi_vm_helpers.ml	Fri Jan 29 16:37:21 2010 +0000
+++ b/ocaml/xapi/xapi_vm_helpers.ml	Fri Jan 29 16:38:32 2010 +0000
@@ -660,8 +660,7 @@
 				(fun xc -> Xc.domain_getinfo xc domain_id) in
 			let memory_actual_pages = Int64.of_nativeint
 				domain_info.Xc.total_memory_pages in
-			let memory_actual_kib = Xc.pages_to_kib memory_actual_pages in
-			Memory.bytes_of_kib memory_actual_kib in
+			Memory.bytes_of_pages memory_actual_pages in
 		let memory_target_bytes =
 			let memory_target_kib = Int64.of_string
 				(Vmopshelpers.with_xs