VirtualBox

Changeset 24704 in vbox for trunk


Ignore:
Timestamp:
Nov 16, 2009 4:25:24 PM (15 years ago)
Author:
vboxsync
Message:

SessionMachine::PushGuestProperty: Fixed state validation. mHWData.backup() seems to have to trouble with our mutable state when teleporting.

Location:
trunk/src/VBox/Main
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Main/ConsoleImpl.cpp

    r24703 r24704  
    57775777
    57785778                /* Change the machine state from Running to Paused. */
     5779/** @todo Live Migration: Deal with Pause happening before VMR3Teleport! */
    57795780                AssertBreak(that->mMachineState == MachineState_Running);
    57805781                that->setMachineState(MachineState_Paused);
  • trunk/src/VBox/Main/MachineImpl.cpp

    r24685 r24704  
    93119311
    93129312        /*
    9313          * Now grab the object lock and do the update
     9313         * Now grab the object lock, validate the state and do the update.
    93149314         */
    93159315        AutoCaller autoCaller(this);
     
    93199319
    93209320        AssertReturn(mHWData->mPropertyServiceActive, VBOX_E_INVALID_OBJECT_STATE);
    9321 
    9322         HRESULT rc = checkStateDependency(MutableStateDep);
    9323         CheckComRCReturnRC(rc);
     9321        switch (mData->mMachineState)
     9322        {
     9323            case MachineState_Paused:
     9324            case MachineState_Running:
     9325            case MachineState_Teleporting:
     9326            case MachineState_TeleportingPausedVM:
     9327            case MachineState_LiveSnapshotting:
     9328            case MachineState_Saving:
     9329                break;
     9330
     9331            default:
     9332                AssertMsgFailedReturn(("%s\n", Global::stringifyMachineState(mData->mMachineState)),
     9333                                      VBOX_E_INVALID_VM_STATE);
     9334        }
    93249335
    93259336        mHWData.backup();
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette