From f0637669eb3ba739f3be06c4af17cf08e7ef6f5e Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Sun, 10 Oct 2010 15:51:47 -0700
Subject: [PATCH] after shutdown, we get the vm status to make sure it is in
 halted state, otherwise return stop error

---
 .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index e7e6155c3f4..bde092d0483 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -2692,6 +2692,10 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
                                     disableVlanNetwork(network);
                                 }
                             }
+                        } else {
+                            String msg = "VM " + vmName + " shutdown succeed, but this vm is not in halted state, it is in " + vm.getPowerState(conn) + " state";
+                            s_logger.warn(msg);
+                            return new StopAnswer(cmd, msg);
                         }
                     } catch (XenAPIException e) {
                         String msg = "VM destroy failed in Stop " + vmName + " Command due to " + e.toString();