Changeset 67625 in vbox

Timestamp:

Jun 27, 2017 9:20:27 AM (8 years ago)

Author:

vboxsync

Message:

Main/Machine+Main/xml: use default hardware version from XML schema for settings

Location:

trunk/src/VBox/Main

Files:

• src-server/MachineImpl.cpp (modified) (3 diffs)
• xml/SchemaDefs.xsl (modified) (11 diffs)

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

@@ -154 +154 @@
 {
     /* default values for a newly created machine */
-    mHWVersion = "2"; /** @todo get the default from the schema if that is possible. */
+    mHWVersion = Utf8StrFmt("%d", SchemaDefs::DefaultHardwareVersion)
     mMemorySize = 128;
     mCPUCount = 1;
@@ -1385 +1385 @@
     Utf8Str hwVersion = aHardwareVersion;
     if (    hwVersion.compare("1") != 0
-        &&  hwVersion.compare("2") != 0)
+        &&  hwVersion.compare("2") != 0)    // VBox 2.1.x and later (VMMDev heap)
         return setError(E_INVALIDARG,
                         tr("Invalid hardware version: %s\n"), aHardwareVersion.c_str());
@@ -10286 +10286 @@
     {
         /* The hardware version attribute (optional).
-            Automatically upgrade from 1 to 2 when there is no saved state. (ugly!) */
+           Automatically upgrade from 1 to current default hardware version
+           when there is no saved state. (ugly!) */
         if (    mHWData->mHWVersion == "1"
              && mSSData->strStateFilePath.isEmpty()
            )
-            mHWData->mHWVersion = "2";  /** @todo Is this safe, to update mHWVersion here? If not some
-                                            other point needs to be found where this can be done. */
+            mHWData->mHWVersion = Utf8StrFmt("%d", SchemaDefs::DefaultHardwareVersion);
 
         data.strVersion = mHWData->mHWVersion;

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

@@ -43 +43 @@
     <xsl:param name="select"/>
     <xsl:if test="$select">
-      <xsl:value-of select="concat($member, ' = ', $select, ',&#x0A;')"/>
+      <xsl:value-of select="concat('        ', $member, ' = ', $select, ',&#x0A;')"/>
     </xsl:if>
 </xsl:template>
@@ -125 +125 @@
 
   <xsl:call-template name="defineEnumMember">
-    <xsl:with-param name="member" select="'        MinGuestRAM'"/>
+    <xsl:with-param name="member" select="'MinGuestRAM'"/>
     <xsl:with-param name="select" select="
       xsd:complexType[@name='TMemory']/xsd:attribute[@name='RAMSize']//xsd:minInclusive/@value
@@ -131 +131 @@
   </xsl:call-template>
   <xsl:call-template name="defineEnumMember">
-    <xsl:with-param name="member" select="'        MaxGuestRAM'"/>
+    <xsl:with-param name="member" select="'MaxGuestRAM'"/>
     <xsl:with-param name="select" select="
       xsd:complexType[@name='TMemory']/xsd:attribute[@name='RAMSize']//xsd:maxInclusive/@value
@@ -138 +138 @@
 
   <xsl:call-template name="defineEnumMember">
-    <xsl:with-param name="member" select="'        MinGuestVRAM'"/>
+    <xsl:with-param name="member" select="'MinGuestVRAM'"/>
     <xsl:with-param name="select" select="
       xsd:complexType[@name='TDisplay']/xsd:attribute[@name='VRAMSize']//xsd:minInclusive/@value
@@ -144 +144 @@
   </xsl:call-template>
   <xsl:call-template name="defineEnumMember">
-    <xsl:with-param name="member" select="'        MaxGuestVRAM'"/>
+    <xsl:with-param name="member" select="'MaxGuestVRAM'"/>
     <xsl:with-param name="select" select="
       xsd:complexType[@name='TDisplay']/xsd:attribute[@name='VRAMSize']//xsd:maxInclusive/@value
@@ -151 +151 @@
 
   <xsl:call-template name="defineEnumMember">
-    <xsl:with-param name="member" select="'        MinCPUCount'"/>
+    <xsl:with-param name="member" select="'MinCPUCount'"/>
     <xsl:with-param name="select" select="
       xsd:simpleType[@name='TCPUCount']//xsd:minInclusive/@value
@@ -157 +157 @@
   </xsl:call-template>
   <xsl:call-template name="defineEnumMember">
-    <xsl:with-param name="member" select="'        MaxCPUCount'"/>
+    <xsl:with-param name="member" select="'MaxCPUCount'"/>
     <xsl:with-param name="select" select="
       xsd:simpleType[@name='TCPUCount']//xsd:maxInclusive/@value
@@ -164 +164 @@
 
   <xsl:call-template name="defineEnumMember">
-    <xsl:with-param name="member" select="'        MaxGuestMonitors'"/>
+    <xsl:with-param name="member" select="'MaxGuestMonitors'"/>
     <xsl:with-param name="select" select="
       xsd:simpleType[@name='TMonitorCount']//xsd:maxInclusive/@value
@@ -171 +171 @@
 
   <xsl:call-template name="defineEnumMember">
-    <xsl:with-param name="member" select="'        SerialPortCount'"/>
+    <xsl:with-param name="member" select="'SerialPortCount'"/>
     <xsl:with-param name="select" select="
       xsd:complexType[@name='TUARTPort']/xsd:attribute[@name='slot']//xsd:maxExclusive/@value
@@ -178 +178 @@
 
   <xsl:call-template name="defineEnumMember">
-    <xsl:with-param name="member" select="'        ParallelPortCount'"/>
+    <xsl:with-param name="member" select="'ParallelPortCount'"/>
     <xsl:with-param name="select" select="
       xsd:complexType[@name='TLPTPort']/xsd:attribute[@name='slot']//xsd:maxExclusive/@value
@@ -185 +185 @@
 
   <xsl:call-template name="defineEnumMember">
-    <xsl:with-param name="member" select="'        MaxBootPosition'"/>
+    <xsl:with-param name="member" select="'MaxBootPosition'"/>
     <xsl:with-param name="select" select="
       xsd:complexType[@name='TBoot']//xsd:element[@name='Order']//xsd:attribute[@name='position']//xsd:maxInclusive/@value
+    "/>
+  </xsl:call-template>
+
+  <xsl:call-template name="defineEnumMember">
+    <xsl:with-param name="member" select="'DefaultHardwareVersion'"/>
+    <xsl:with-param name="select" select="
+      xsd:complexType[@name='THardware']/xsd:attribute[@name='version']/@default
     "/>
   </xsl:call-template>