From 0cf11e68081a894f03be052386fe6c2c4b89f5b1 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 22 Oct 2009 15:07:33 +0900
Subject: [PATCH] Xen: Ignore the retry argument in stop instance
Commit 4ad4511 changed the KVM hypervisor to send multiple shutdown
requests to the monitor, but it didn't change this for the Xen
hypervisor. We simply remove the return on retry model, since we do want
to send multiple shutdown signals for both Xen and KVM (even if the
behaviour is not perfect, they should behave the same).
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/hypervisor/hv_xen.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/lib/hypervisor/hv_xen.py b/lib/hypervisor/hv_xen.py
index 22a0945b9..f954e2396 100644
--- a/lib/hypervisor/hv_xen.py
+++ b/lib/hypervisor/hv_xen.py
@@ -182,8 +182,6 @@ class XenHypervisor(hv_base.BaseHypervisor):
"""Stop an instance.
"""
- if retry:
- return
self._RemoveConfigFile(instance.name)
if force:
command = ["xm", "destroy", instance.name]
--
GitLab