1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00

Merge branch 'bug-317'

This commit is contained in:
Ruben S. Montero 2010-12-28 15:52:07 +01:00
commit e7a05f515f

View File

@ -107,8 +107,9 @@ void RequestManager::VirtualMachineMigrate::execute(
}
}
if ((vm->get_state() != VirtualMachine::ACTIVE) ||
(vm->get_lcm_state() != VirtualMachine::RUNNING))
if((vm->get_state() != VirtualMachine::ACTIVE) ||
(vm->get_lcm_state() != VirtualMachine::RUNNING) ||
(vm->hasPreviousHistory() && vm->get_previous_reason() == History::NONE))
{
goto error_state;
}