Changeset 95639 in vbox for trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

Timestamp:

Jul 14, 2022 8:30:45 AM (2 years ago)

Author:

vboxsync

Message:

Recording: Settings handling fixes / overhaul. This adds the ability to handle per-screen settings, which can be different from the first screen (screen 0). Also fixed a couple of bugs regarding snapshot handling and persistence (committing, rolling back, ++) in that area. FE/VBoxManage now can also list the per-screen settings. Added some further @todos. bugref:9286

File:

• trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -867 +867 @@
         data.strStateFile.setNull();
 
-    HRESULT rc = m->pMachine->i_saveHardware(data.hardware, &data.debugging, &data.autostart);
-    if (FAILED(rc)) return rc;
-
-    return S_OK;
+    return m->pMachine->i_saveHardware(data.hardware, &data.debugging, &data.autostart, data.recordingSettings);
 }
 
@@ -1164 +1161 @@
     if (FAILED(rc)) return rc;
 
+    unconst(mRecordingSettings).createObject();
+    rc = mRecordingSettings->initCopy(this, pMachine->mRecordingSettings);
+    if (FAILED(rc)) return rc;
+
     unconst(mTrustedPlatformModule).createObject();
     rc = mTrustedPlatformModule->initCopy(this, pMachine->mTrustedPlatformModule);
@@ -1170 +1171 @@
     unconst(mNvramStore).createObject();
     rc = mNvramStore->initCopy(this, pMachine->mNvramStore);
-    if (FAILED(rc)) return rc;
-
-    unconst(mRecordingSettings).createObject();
-    rc = mRecordingSettings->initCopy(this, pMachine->mRecordingSettings);
     if (FAILED(rc)) return rc;
 
@@ -1247 +1244 @@
  *  @param pDbg             debuging settings
  *  @param pAutostart       autostart settings
+ *  @param recording        recording settings
  *  @param aSnapshotId      snapshot ID of this snapshot machine
  *  @param aStateFilePath   file where the execution state is saved
@@ -1257 +1255 @@
                                           const settings::Debugging *pDbg,
                                           const settings::Autostart *pAutostart,
+                                          const settings::RecordingSettings &recording,
                                           IN_GUID aSnapshotId,
                                           const Utf8Str &aStateFilePath)
@@ -1302 +1301 @@
     mBIOSSettings->init(this);
 
+    unconst(mRecordingSettings).createObject();
+    mRecordingSettings->init(this);
+
     unconst(mTrustedPlatformModule).createObject();
     mTrustedPlatformModule->init(this);
@@ -1308 +1310 @@
     mNvramStore->init(this);
 
-    unconst(mRecordingSettings).createObject();
-    mRecordingSettings->init(this);
-
     unconst(mGraphicsAdapter).createObject();
     mGraphicsAdapter->init(this);
@@ -1346 +1345 @@
 
     /* load hardware and storage settings */
-    HRESULT rc = i_loadHardware(NULL, &mSnapshotId, hardware, pDbg, pAutostart);
-
-    if (SUCCEEDED(rc))
+    HRESULT hrc = i_loadHardware(NULL, &mSnapshotId, hardware, pDbg, pAutostart, recording);
+    if (SUCCEEDED(hrc))
         /* commit all changes made during the initialization */
         i_commit();   /// @todo r=dj why do we need a commit in init?!? this is very expensive
@@ -1355 +1353 @@
 
     /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         autoInitSpan.setSucceeded();
 
     LogFlowThisFuncLeave();
-    return rc;
+    return hrc;
 }