Revision dd3edff6 src/lcm/LifeCycleStates.cc

View differences:

src/lcm/LifeCycleStates.cc
309 309
              vm->get_lcm_state() == VirtualMachine::BOOT_SUSPENDED||
310 310
              vm->get_lcm_state() == VirtualMachine::BOOT_STOPPED ||
311 311
              vm->get_lcm_state() == VirtualMachine::BOOT_UNDEPLOY ||
312
              vm->get_lcm_state() == VirtualMachine::BOOT_MIGRATE ||
313
              vm->get_lcm_state() == VirtualMachine::BOOT_MIGRATE_FAILURE ||
314
              vm->get_lcm_state() == VirtualMachine::BOOT_FAILURE )
312
              vm->get_lcm_state() == VirtualMachine::BOOT_MIGRATE )
315 313
    {
316 314
        vm->set_state(VirtualMachine::RUNNING);
317 315

  
......
403 401

  
404 402
        vmm->trigger(VirtualMachineManager::POLL,vid);
405 403
    }
406
    else if (vm->get_lcm_state() == VirtualMachine::BOOT ||
407
             vm->get_lcm_state() == VirtualMachine::BOOT_FAILURE)
404
    else if (vm->get_lcm_state() == VirtualMachine::BOOT)
408 405
    {
409 406
        vm->set_state(VirtualMachine::BOOT_FAILURE);
410 407

  
......
412 409

  
413 410
        vm->log("LCM", Log::INFO, "Fail to boot VM. New VM state is BOOT_FAILURE");
414 411
    }
415
    else if (vm->get_lcm_state() == VirtualMachine::BOOT_MIGRATE ||
416
             vm->get_lcm_state() == VirtualMachine::BOOT_MIGRATE_FAILURE )
412
    else if (vm->get_lcm_state() == VirtualMachine::BOOT_MIGRATE)
417 413
    {
418 414
        vm->set_state(VirtualMachine::BOOT_MIGRATE_FAILURE);
419 415

  

Also available in: Unified diff