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

Timestamp:

Oct 16, 2008 3:16:29 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

38043

Message:

Main/MachineImpl: Made HardwareVirtExVPID, HardwareVirtExNestedPaging and PAE (under Hardware/CPU) make use of their default values so we can more easily go back and forth between branch and trunk.

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -5037 +5037 @@
                 /* property flags (optional, defaults to empty) */
                 Bstr flags = (*it).stringValue ("flags");
-    
+
                 HWData::GuestProperty property = { name, value, timestamp, flags };
                 mHWData->mGuestProperties.push_back(property);
@@ -6189 +6189 @@
     HRESULT rc = S_OK;
 
-    /* CPU (optional) */
+    /* CPU (optional, but always created atm) */
     {
         Key cpuNode = aNode.createKey ("CPU");
@@ -6209 +6209 @@
 
         /* Nested paging (optional, default is false) */
-        Key HWVirtExNestedPagingNode = cpuNode.createKey ("HardwareVirtExNestedPaging");
-        HWVirtExNestedPagingNode.setValue <bool> ("enabled", !!mHWData->mHWVirtExNestedPagingEnabled);
+        if (mHWData->mHWVirtExNestedPagingEnabled)
+        {
+            Key HWVirtExNestedPagingNode = cpuNode.createKey ("HardwareVirtExNestedPaging");
+            HWVirtExNestedPagingNode.setValue <bool> ("enabled", true);
+        }
 
         /* VPID (optional, default is false) */
-        Key HWVirtExVPIDNode = cpuNode.createKey ("HardwareVirtExVPID");
-        HWVirtExVPIDNode.setValue <bool> ("enabled", !!mHWData->mHWVirtExVPIDEnabled);
+        if (mHWData->mHWVirtExVPIDEnabled)
+        {
+            Key HWVirtExVPIDNode = cpuNode.createKey ("HardwareVirtExVPID");
+            HWVirtExVPIDNode.setValue <bool> ("enabled", true);
+        }
 
         /* PAE (optional, default is false) */
-        Key PAENode = cpuNode.createKey ("PAE");
-        PAENode.setValue <bool> ("enabled", !!mHWData->mPAEEnabled);
+        if (mHWData->mPAEEnabled)
+        {
+            Key PAENode = cpuNode.createKey ("PAE");
+            PAENode.setValue <bool> ("enabled", true);
+        }
     }