# HG changeset patch # User Jonathan Knowles <[email protected]> # Date 1267790740 0 # Node ID 2953db596f21e8b7c4379e69df1b02e866168d4c # Parent 4492bbf2240a68986109c8cc1f57c51ae901a5f6 [CA-38363 and CA-38364] All types of VM clone operation now clone the guest metrics record if one is present.
Signed-off-by: Jonathan Knowles <[email protected]> diff -r 4492bbf2240a -r 2953db596f21 ocaml/xapi/xapi_vm_clone.ml --- a/ocaml/xapi/xapi_vm_clone.ml Fri Mar 05 12:05:40 2010 +0000 +++ b/ocaml/xapi/xapi_vm_clone.ml Fri Mar 05 12:05:40 2010 +0000 @@ -229,10 +229,7 @@ ~last_updated:(default Date.never (may (fun x -> x.Db_actions.vM_metrics_last_updated) m)) ~other_config:(default [] (may (fun x -> x.Db_actions.vM_metrics_other_config) m)); - (* For checkpoints, copy the guest metrics (as the VM will be reverted in a suspended state *) - let guest_metrics = match disk_op with - | Disk_op_checkpoint -> Xapi_vm_helpers.copy_guest_metrics ~__context ~vm - | _ -> Ref.null in + let guest_metrics = Xapi_vm_helpers.copy_guest_metrics ~__context ~vm in (* compute the parent VM *) let parent = 1 file changed, 1 insertion(+), 4 deletions(-) ocaml/xapi/xapi_vm_clone.ml | 5 +----
# HG changeset patch # User Jonathan Knowles <[email protected]> # Date 1267790740 0 # Node ID 2953db596f21e8b7c4379e69df1b02e866168d4c # Parent 4492bbf2240a68986109c8cc1f57c51ae901a5f6 [CA-38363 and CA-38364] All types of VM clone operation now clone the guest metrics record if one is present. Signed-off-by: Jonathan Knowles <[email protected]> diff -r 4492bbf2240a -r 2953db596f21 ocaml/xapi/xapi_vm_clone.ml --- a/ocaml/xapi/xapi_vm_clone.ml Fri Mar 05 12:05:40 2010 +0000 +++ b/ocaml/xapi/xapi_vm_clone.ml Fri Mar 05 12:05:40 2010 +0000 @@ -229,10 +229,7 @@ ~last_updated:(default Date.never (may (fun x -> x.Db_actions.vM_metrics_last_updated) m)) ~other_config:(default [] (may (fun x -> x.Db_actions.vM_metrics_other_config) m)); - (* For checkpoints, copy the guest metrics (as the VM will be reverted in a suspended state *) - let guest_metrics = match disk_op with - | Disk_op_checkpoint -> Xapi_vm_helpers.copy_guest_metrics ~__context ~vm - | _ -> Ref.null in + let guest_metrics = Xapi_vm_helpers.copy_guest_metrics ~__context ~vm in (* compute the parent VM *) let parent =
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
