Changeset 81971 in vbox for trunk/src

Timestamp:

Nov 18, 2019 9:35:57 PM (5 years ago)

Author:

vboxsync

Message:

Main/Machine+GraphicsAdapter: previously missed proper removal of settings which are now in a different object

Location:

trunk/src/VBox/Main

Files:

• include/MachineImpl.h (modified) (5 diffs)
• src-server/GraphicsAdapterImpl.cpp (modified) (5 diffs)
• src-server/MachineImpl.cpp (modified) (4 diffs)
• src-server/RecordingSettingsImpl.cpp (modified) (1 diff)

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

@@ -276 +276 @@
         ULONG               mMemoryBalloonSize;
         BOOL                mPageFusionEnabled;
-        GraphicsControllerType_T mGraphicsControllerType;
-        ULONG               mVRAMSize;
         settings::RecordingSettings mRecordSettings;
-        ULONG               mMonitorCount;
         BOOL                mHWVirtExEnabled;
         BOOL                mHWVirtExNestedPagingEnabled;
@@ -287 +284 @@
         BOOL                mHWVirtExForceEnabled;
         BOOL                mHWVirtExUseNativeApi;
-        BOOL                mAccelerate2DVideoEnabled;
         BOOL                mPAEEnabled;
         settings::Hardware::LongModeType mLongMode;
@@ -307 +303 @@
         uint32_t            mCpuIdPortabilityLevel;
         Utf8Str             mCpuProfile;
-        BOOL                mAccelerate3DEnabled;
         BOOL                mHPETEnabled;
 
@@ -495 +490 @@
         IsModified_Snapshots            = 0x0800,
         IsModified_BandwidthControl     = 0x1000,
-        IsModified_Recording            = 0x2000
+        IsModified_Recording            = 0x2000,
+        IsModified_GraphicsAdapter      = 0x4000,
     };
 
@@ -508 +504 @@
     ChipsetType_T i_getChipsetType() const { return mHWData->mChipsetType; }
     FirmwareType_T i_getFirmwareType() const { return mHWData->mFirmwareType; }
-    ULONG i_getMonitorCount() const { return mHWData->mMonitorCount; }
     ParavirtProvider_T i_getParavirtProvider() const { return mHWData->mParavirtProvider; }
     Utf8Str i_getParavirtDebug() const { return mHWData->mParavirtDebug; }

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

@@ -200 +200 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mParent->i_setModified(Machine::IsModified_MachineData);
+    mParent->i_setModified(Machine::IsModified_GraphicsAdapter);
     mData.backup();
     mData->graphicsControllerType = aGraphicsControllerType;
@@ -230 +230 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mParent->i_setModified(Machine::IsModified_MachineData);
+    mParent->i_setModified(Machine::IsModified_GraphicsAdapter);
     mData.backup();
     mData->ulVRAMSizeMB = aVRAMSize;
@@ -256 +256 @@
     /** @todo check validity! */
 
-    mParent->i_setModified(Machine::IsModified_MachineData);
+    mParent->i_setModified(Machine::IsModified_GraphicsAdapter);
     mData.backup();
     mData->fAccelerate3D = !!aAccelerate3DEnabled;
@@ -288 +288 @@
     /** @todo check validity! */
 
-    mParent->i_setModified(Machine::IsModified_MachineData);
+    mParent->i_setModified(Machine::IsModified_GraphicsAdapter);
     mData.backup();
     mData->fAccelerate2DVideo = !!aAccelerate2DVideoEnabled;
@@ -318 +318 @@
     if (FAILED(adep.rc())) return adep.rc();
 
-    mParent->i_setModified(Machine::IsModified_MachineData);
+    mParent->i_setModified(Machine::IsModified_GraphicsAdapter);
     mData.backup();
     mData->cMonitors = aMonitorCount;

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

@@ -175 +175 @@
     mMemoryBalloonSize = 0;
     mPageFusionEnabled = false;
-    mGraphicsControllerType = GraphicsControllerType_VBoxVGA;
-    mVRAMSize = 8;
-    mAccelerate3DEnabled = false;
-    mAccelerate2DVideoEnabled = false;
-    mMonitorCount = 1;
     mHWVirtExEnabled = true;
     mHWVirtExNestedPagingEnabled = true;
@@ -11724 +11719 @@
         mRecordingSettings->i_rollback();
 
-    if (mGraphicsAdapter)
+    if (mGraphicsAdapter && (mData->flModifications & IsModified_GraphicsAdapter))
         mGraphicsAdapter->i_rollback();
 
@@ -11730 +11725 @@
         mVRDEServer->i_rollback();
 
-    if (mAudioAdapter)
+    if (mAudioAdapter && (mData->flModifications & IsModified_AudioAdapter))
         mAudioAdapter->i_rollback();
 
@@ -15265 +15260 @@
     if (FAILED(rc)) return rc;
 
-    rc = osType->COMGETTER(RecommendedGraphicsController)(&mHWData->mGraphicsControllerType);
+    /* Graphics stuff. */
+    GraphicsControllerType_T graphicsController;
+    rc = osType->COMGETTER(RecommendedGraphicsController)(&graphicsController);
     if (FAILED(rc)) return rc;
 
-    rc = osType->COMGETTER(RecommendedVRAM)(&mHWData->mVRAMSize);
+    rc = mGraphicsAdapter->COMSETTER(GraphicsControllerType)(graphicsController);
     if (FAILED(rc)) return rc;
 
-    rc = osType->COMGETTER(Recommended2DVideoAcceleration)(&mHWData->mAccelerate2DVideoEnabled);
+    ULONG vramSize;
+    rc = osType->COMGETTER(RecommendedVRAM)(&vramSize);
     if (FAILED(rc)) return rc;
 
-    rc = osType->COMGETTER(Recommended3DAcceleration)(&mHWData->mAccelerate3DEnabled);
+    rc = mGraphicsAdapter->COMSETTER(VRAMSize)(vramSize);
+    if (FAILED(rc)) return rc;
+
+    BOOL fAccelerate2DVideoEnabled;
+    rc = osType->COMGETTER(Recommended2DVideoAcceleration)(&fAccelerate2DVideoEnabled);
+    if (FAILED(rc)) return rc;
+
+    rc = mGraphicsAdapter->COMSETTER(Accelerate2DVideoEnabled)(fAccelerate2DVideoEnabled);
+    if (FAILED(rc)) return rc;
+
+    BOOL fAccelerate3DEnabled;
+    rc = osType->COMGETTER(Recommended3DAcceleration)(&fAccelerate3DEnabled);
+    if (FAILED(rc)) return rc;
+
+    rc = mGraphicsAdapter->COMSETTER(Accelerate3DEnabled)(fAccelerate3DEnabled);
     if (FAILED(rc)) return rc;
 

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

@@ -636 +636 @@
 int RecordingSettings::i_syncToMachineDisplays(void)
 {
+    AssertPtr(m->pMachine);
+    ComPtr<IGraphicsAdapter> pGraphicsAdapter;
+    m->pMachine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());
+    ULONG cMonitors = 0;
+    if (!pGraphicsAdapter.isNull())
+        pGraphicsAdapter->COMGETTER(MonitorCount)(&cMonitors);
+
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    AssertPtr(m->pMachine);
-    const ULONG cMonitors = m->pMachine->i_getMonitorCount();
 
     LogFlowThisFunc(("cMonitors=%RU32\n", cMonitors));