Changeset 15582 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Dec 16, 2008 1:22:33 PM (16 years ago)

Author:

vboxsync

Message:

#3281: Introduced a 'version' attribute on the <Hardware> element setting it to '1' during conversion if a saved state was found, otherwise using the default of '2'.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -187 +187 @@
 {
     /* default values for a newly created machine */
+    mHWVersion = "2"; /** @todo get the default from the schema if that is possible. */
     mMemorySize = 128;
     mCPUCount = 1;
@@ -220 +221 @@
         return true;
 
-    if (mMemorySize != that.mMemorySize ||
+    if (mHWVersion != that.mHWVersion ||
+        mMemorySize != that.mMemorySize ||
         mMemoryBalloonSize != that.mMemoryBalloonSize ||
         mStatisticsUpdateInterval != that.mStatisticsUpdateInterval ||
@@ -907 +909 @@
     mUserData.backup();
     mUserData->mOSTypeId = aOSTypeId;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMGETTER(HardwareVersion) (BSTR *aHWVersion)
+{
+    if (!aHWVersion)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    mHWData->mHWVersion.cloneTo (aHWVersion);
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(HardwareVersion) (IN_BSTR aHWVersion)
+{
+    /* check known version */
+    Utf8Str hwVersion = aHWVersion;
+    if (    hwVersion.compare ("1") != 0
+        &&  hwVersion.compare ("2") != 0)
+        return setError (E_INVALIDARG,
+            tr ("Invalid hardware version: %ls\n"), aHWVersion);
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoWriteLock alock (this);
+
+    HRESULT rc = checkStateDependency (MutableStateDep);
+    CheckComRCReturnRC (rc);
+
+    mHWData.backup();
+    mHWData->mHWVersion = hwVersion;
 
     return S_OK;
@@ -4969 +5009 @@
     HRESULT rc = S_OK;
 
+    /* The hardware version attribute (optional). */
+    mHWData->mHWVersion = aNode.stringValue ("version");
+
     /* CPU node (currently not required) */
     {
@@ -6357 +6400 @@
 
     HRESULT rc = S_OK;
+
+    /* The hardware version attribute (optional).
+       Automatically upgrade from 1 to 2 when there is no saved state. (ugly!) */
+    {
+        Utf8Str hwVersion = mHWData->mHWVersion;
+        if (   hwVersion.compare ("1") == 0
+            && mSSData->mStateFilePath.isEmpty())
+            mHWData->mHWVersion = hwVersion = "2";  /** @todo Is this safe, to update mHWVersion here? If not some other point needs to be found where this can be done. */
+        if (hwVersion.compare ("2") == 0)           /** @todo get the default from the schema if possible. */
+            aNode.zapValue ("version");
+        else
+            aNode.setStringValue ("version", hwVersion.raw());
+    }
 
     /* CPU (optional, but always created atm) */