From f5b051bbd0858294157f911ecbb04542fadbb38d Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Sat, 22 Jan 2011 04:59:58 +0000
Subject: Skip shutdown if already halted

---
 nova/virt/xenapi/vmops.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 7ae93b243..2ccd1ec24 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -254,6 +254,12 @@ class VMOps(object):
 
     def _shutdown(self, instance, vm):
         """Shutdown an instance """
+        state = self.get_info(instance['name'])['state']
+        if state == power_state.SHUTDOWN:
+            LOG.warn(_("VM %(vm)s already halted, skipping shutdown...") %
+                     locals())
+            return
+
         try:
             task = self._session.call_xenapi('Async.VM.hard_shutdown', vm)
             self._session.wait_for_task(instance.id, task)
-- 
cgit