Changeset 15582 in vbox for trunk/src/VBox

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'.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (5 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/MachineImpl.h (modified) (2 diffs)
• xml/SettingsConverter.xsl (modified) (1 diff)
• xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1702 +1702 @@
     afPciDeviceNo[4] = true;
     rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                     RC_CHECK();
+    Bstr hwVersion;
+    hrc = pMachine->COMGETTER(HardwareVersion)(hwVersion.asOutParam());             H();
+    if (hwVersion.compare(Bstr("1")) == 0) /* <= 2.0.x */
+    {
+        CFGMR3InsertInteger(pCfg, "HeapEnabled", 0);                                RC_CHECK();
+    }
 
     /* the VMM device's Main driver */

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) */

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

@@ -3126 +3126 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="a744b229-3457-422f-8550-649c40346c55"
+     uuid="ea6fb7ea-1993-4642-b113-f29eb39e0df0"
      wsmap="managed"
      >
@@ -3308 +3308 @@
         </note>
       </desc>
+    </attribute>
+
+    <attribute name="HardwareVersion" type="wstring">
+      <desc>Hardware version identifier. Internal use only for now.</desc>
     </attribute>
 

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

@@ -250 +250 @@
         bool operator== (const HWData &that) const;
 
+        Bstr           mHWVersion;
         ULONG          mMemorySize;
         ULONG          mMemoryBalloonSize;
@@ -475 +476 @@
     STDMETHOD(COMGETTER(OSTypeId)) (BSTR *aOSTypeId);
     STDMETHOD(COMSETTER(OSTypeId)) (IN_BSTR aOSTypeId);
+    STDMETHOD(COMGETTER(HardwareVersion))(BSTR *aVersion);
+    STDMETHOD(COMSETTER(HardwareVersion))(IN_BSTR aVersion);
     STDMETHOD(COMGETTER(MemorySize))(ULONG *memorySize);
     STDMETHOD(COMSETTER(MemorySize))(ULONG memorySize);

trunk/src/VBox/Main/xml/SettingsConverter.xsl

@@ -667 +667 @@
 -->
 
+  <xsl:template match="vb:VirtualBox[substring-before(@version,'-')='1.3']/
+                     vb:Machine/vb:Hardware"
+              mode="v1.4">
+  <!-- add version attribute to Hardware if parent Machine has a stateFile attribute -->
+  <xsl:copy>
+    <xsl:if test="../@stateFile">
+      <xsl:attribute name="version">1</xsl:attribute>
+    </xsl:if>
+    <xsl:apply-templates select="node()" mode="v1.4"/>
+  </xsl:copy>
+</xsl:template>
+
+
 <!--
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -763 +763 @@
     </xsd:element>
   </xsd:all>
+  <xsd:attribute name="version" type="xsd:string" default="2"/>
 </xsd:complexType>