From bf7aab9a16743a4513373a6bcb091f604044df37 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Thu, 21 Feb 2013 15:04:26 +0100 Subject: [PATCH] Feature #1224: Fix bug in LCM method snapshot_revert_success --- src/lcm/LifeCycleStates.cc | 2 +- src/vmm_mad/remotes/vmware/snapshot_create | 0 src/vmm_mad/remotes/vmware/snapshot_revert | 0 src/vmm_mad/remotes/xen/snapshot_create | 0 src/vmm_mad/remotes/xen/snapshot_revert | 0 5 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 src/vmm_mad/remotes/vmware/snapshot_create mode change 100644 => 100755 src/vmm_mad/remotes/vmware/snapshot_revert mode change 100644 => 100755 src/vmm_mad/remotes/xen/snapshot_create mode change 100644 => 100755 src/vmm_mad/remotes/xen/snapshot_revert diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index 41dca22265..0ae0863157 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -1263,7 +1263,7 @@ void LifeCycleManager::snapshot_create_failure(int vid) if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG ) { - vm->delete_active_snapshot(); + vm->clear_active_snapshot(); vm->set_state(VirtualMachine::RUNNING); diff --git a/src/vmm_mad/remotes/vmware/snapshot_create b/src/vmm_mad/remotes/vmware/snapshot_create old mode 100644 new mode 100755 diff --git a/src/vmm_mad/remotes/vmware/snapshot_revert b/src/vmm_mad/remotes/vmware/snapshot_revert old mode 100644 new mode 100755 diff --git a/src/vmm_mad/remotes/xen/snapshot_create b/src/vmm_mad/remotes/xen/snapshot_create old mode 100644 new mode 100755 diff --git a/src/vmm_mad/remotes/xen/snapshot_revert b/src/vmm_mad/remotes/xen/snapshot_revert old mode 100644 new mode 100755