From: Daniel Stodden <daniel.stodden@citrix.com>
Date: Wed, 26 Jan 2011 17:39:04 +0000 (+0000)
Subject: CA-40610: Fix lvhdrt/tc8713 vm cleanup path.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=705bd3045884150e3d00f305717b49377f19da67;p=xcp%2Fxen-api.git

CA-40610: Fix lvhdrt/tc8713 vm cleanup path.

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>
---

diff --git a/ocaml/lvhdrt/utils.ml b/ocaml/lvhdrt/utils.ml
index c1e44439..fdec789e 100644
--- a/ocaml/lvhdrt/utils.ml
+++ b/ocaml/lvhdrt/utils.ml
@@ -232,6 +232,8 @@ let with_sacrificial_vm rpc session f =
     Pervasiveext.finally 
       (fun () -> f vm')
       (fun () ->
+	 if Client.VM.get_power_state rpc session vm' <> `Halted then
+	   Client.VM.hard_shutdown rpc session vm';
 	 List.iter 
 	   (fun vbd ->
 	      let vdi = Client.VBD.get_VDI rpc session vbd in