Changeset 23599 in vbox

Timestamp:

Oct 7, 2009 5:24:18 PM (15 years ago)

Author:

vboxsync

Message:

Main: Live migration work.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl-LiveMigration.cpp (added)
• MachineImpl.cpp (modified) (5 diffs)
• Makefile.kmk (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (4 diffs)
• include/ConsoleImpl.h (modified) (1 diff)
• include/MachineImpl.h (modified) (3 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -155 +155 @@
 
     mNameSync = TRUE;
+    mLiveMigrationTarget = FALSE;
+    mLiveMigrationPort = 0;
 
     /* mName, mOSTypeId, mSnapshotFolder, mSnapshotFolderFull are initialized in
@@ -1817 +1819 @@
     mHWData->mGuestPropertyNotificationPatterns.cloneTo(aPatterns);
 
-    return RT_LIKELY (aPatterns != NULL) ? S_OK : E_OUTOFMEMORY;
+    return RT_LIKELY (aPatterns != NULL) ? S_OK : E_OUTOFMEMORY; /** @todo r=bird: this is wrong... :-) */
 }
 
@@ -1854 +1856 @@
     return S_OK;
 }
+
+STDMETHODIMP
+Machine::COMGETTER(LiveMigrationTarget)(BOOL *aEnabled)
+{
+    CheckComArgOutPointerValid(aEnabled);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
+
+    *aEnabled = mUserData->mLiveMigrationTarget;
+
+    return S_OK;
+}
+
+STDMETHODIMP
+Machine::COMSETTER(LiveMigrationTarget)(BOOL aEnabled)
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
+
+    /* Only allow it to be set to true when PoweredOff.
+       (Clearing it is always permitted.) */
+    if (    aEnabled
+        &&  mData->mRegistered
+        &&  (   mType != IsSessionMachine
+             || mData->mMachineState > MachineState_PoweredOff)
+       )
+        return setError(VBOX_E_INVALID_VM_STATE,
+                        tr("The machine is not powered off (state is %d)"),
+                        mData->mMachineState);
+
+    mUserData.backup();
+    mUserData->mLiveMigrationTarget = aEnabled;
+
+    return S_OK;
+}
+
+STDMETHODIMP
+Machine::COMGETTER(LiveMigrationPort)(ULONG *aPort)
+{
+    CheckComArgOutPointerValid(aPort);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
+
+    *aPort = mUserData->mLiveMigrationPort;
+
+    return S_OK;
+}
+
+STDMETHODIMP
+Machine::COMSETTER(LiveMigrationPort)(ULONG aPort)
+{
+    if (aPort >= _64K)
+        return setError(E_INVALIDARG, tr("Invalid port number %d"), aPort);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    CheckComRCReturnRC(rc);
+
+    mUserData.backup();
+    mUserData->mLiveMigrationPort = aPort;
+
+    return S_OK;
+}
+
+STDMETHODIMP
+Machine::COMGETTER(LiveMigrationPassword)(BSTR *aPassword)
+{
+    CheckComArgOutPointerValid(aPassword);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
+
+    mUserData->mLiveMigrationPassword.cloneTo(aPassword);
+
+    return S_OK;
+}
+
+STDMETHODIMP
+Machine::COMSETTER(LiveMigrationPassword)(IN_BSTR aPassword)
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    CheckComRCReturnRC(rc);
+
+    mUserData.backup();
+    mUserData->mLiveMigrationPassword = aPassword;
+
+    return S_OK;
+}
+
 
 // IMachine methods
@@ -4922 +5032 @@
         mData->mLastStateChange = mData->m_pMachineConfigFile->timeLastStateChange;
 
+/** @todo LiveMigration: Load LiveMigration properties here. */
         /*
          *  note: all mUserData members must be assigned prior this point because
@@ -5911 +6022 @@
         mData->m_pMachineConfigFile->timeLastStateChange = mData->mLastStateChange;
         mData->m_pMachineConfigFile->fAborted = (mData->mMachineState == MachineState_Aborted);
+/** @todo LiveMigration: Save LiveMigration properties here. */
 
         rc = saveHardware(mData->m_pMachineConfigFile->hardwareMachine);

trunk/src/VBox/Main/Makefile.kmk

@@ -598 +598 @@
         ConsoleImpl.cpp \
         ConsoleImpl2.cpp \
+        ConsoleImpl-LiveMigration.cpp \
         ConsoleVRDPServer.cpp \
         GuestImpl.cpp \

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4002 +4002 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="445ecfcc-8ebd-a2a5-459c-4d21ae0b206b"
+     uuid="160b0ccc-c3d6-4c1b-bbe9-39b1a732f833"
      wsmap="managed"
      >
@@ -4491 +4491 @@
     </attribute>
 
+    <attribute name="liveMigrationTarget" type="boolean">
+      <desc>
+        When set to @a true, the virtual machine becomes a live migration
+        target.  This can only set to @a true when the VM is in the @a
+        PoweredOff state.
+
+        This property is automatically set to @a false when the VM is powered
+        on.
+      </desc>
+    </attribute>
+
+    <attribute name="liveMigrationPort" type="unsigned long">
+      <desc>
+        The TCP port used for live migration.  This can only be set when the
+        VM is in the @a PoweredOff state.
+
+        0 means the port is automatically selected and the source machine will
+        have to be told where to connected after the destination has been
+        started.
+      </desc>
+    </attribute>
+
+    <attribute name="liveMigrationPassword" type="wstring">
+      <desc>
+        The password the live migration target will check for.
+      </desc>
+    </attribute>
+
     <method name="setBootOrder">
       <desc>
@@ -5913 +5941 @@
   <interface
      name="IConsole" extends="$unknown"
-     uuid="0a51994b-cbc6-4686-94eb-d4e4023280e2"
+     uuid="c47486e1-3d99-4212-b1c5-86451978999d"
      wsmap="managed"
      >
@@ -6646 +6674 @@
         </result>
       </desc>
+      <param name="progress" type="IProgress" dir="return">
+        <desc>Progress object to track the operation completion.</desc>
+      </param>
+    </method>
+
+    <method name="migrate">
+      <desc>
+        Migrate the VM to a different host machine.
+
+        TODO explain the details.
+
+        <result name="VBOX_E_INVALID_VM_STATE">
+          Virtual machine not running or paused.
+        </result>
+      </desc>
+      <param name="hostname" type="wstring" dir="in">
+        <desc>The name or IP of the host to migrate to.</desc>
+      </param>
+      <param name="port" type="unsigned long" dir="in">
+        <desc>The TCP port to connect to (1..65535).</desc>
+      </param>
+      <param name="password" type="wstring" dir="in">
+        <desc>The password.</desc>
+      </param>
       <param name="progress" type="IProgress" dir="return">
         <desc>Progress object to track the operation completion.</desc>

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -147 +147 @@
     STDMETHOD(DiscardCurrentState) (IProgress **aProgress);
     STDMETHOD(DiscardCurrentSnapshotAndState) (IProgress **aProgress);
+    STDMETHOD(Migrate)(IN_BSTR aHostname, ULONG aPort, IN_BSTR aPassword, IProgress **aProgress);
     STDMETHOD(RegisterCallback) (IConsoleCallback *aCallback);
     STDMETHOD(UnregisterCallback)(IConsoleCallback *aCallback);

trunk/src/VBox/Main/include/MachineImpl.h

@@ -233 +233 @@
                     mDescription == that.mDescription &&
                     mOSTypeId == that.mOSTypeId &&
-                    mSnapshotFolderFull == that.mSnapshotFolderFull);
+                    mSnapshotFolderFull == that.mSnapshotFolderFull &&
+                    mLiveMigrationTarget == that.mLiveMigrationTarget &&
+                    mLiveMigrationPort == that.mLiveMigrationPort &&
+                    mLiveMigrationPassword == that.mLiveMigrationPassword);
         }
 
@@ -242 +245 @@
         Bstr    mSnapshotFolder;
         Bstr    mSnapshotFolderFull;
+        BOOL    mLiveMigrationTarget;
+        ULONG   mLiveMigrationPort;
+        Bstr    mLiveMigrationPassword;
     };
 
@@ -560 +566 @@
     STDMETHOD(COMSETTER(GuestPropertyNotificationPatterns))(IN_BSTR aPattern);
     STDMETHOD(COMGETTER(StorageControllers))(ComSafeArrayOut(IStorageController *, aStorageControllers));
+    STDMETHOD(COMGETTER(LiveMigrationTarget))(BOOL *aEnabled);
+    STDMETHOD(COMSETTER(LiveMigrationTarget))(BOOL aEnabled);
+    STDMETHOD(COMGETTER(LiveMigrationPort))(ULONG *aPort);
+    STDMETHOD(COMSETTER(LiveMigrationPort))(ULONG aPort);
+    STDMETHOD(COMGETTER(LiveMigrationPassword))(BSTR *aPassword);
+    STDMETHOD(COMSETTER(LiveMigrationPassword))(IN_BSTR aPassword);
 
     // IMachine methods