Changeset 31818 in vbox for trunk/src/VBox/Main/ConsoleImpl2.cpp

Timestamp:

Aug 20, 2010 1:06:33 PM (15 years ago)

Author:

vboxsync

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

65018

Message:

added HWVirtEx force property to API

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -636 +636 @@
          */
         BOOL fHWVirtExEnabled;
-        BOOL fHwVirtExtForced;
+        BOOL fHwVirtExtForced = false;
 #ifdef VBOX_WITH_RAW_MODE
         hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_Enabled, &fHWVirtExEnabled); H();
@@ -652 +652 @@
 # endif
 #else  /* !VBOX_WITH_RAW_MODE */
-        fHWVirtExEnabled = fHwVirtExtForced = TRUE;
+        fHWVirtExEnabled = fHwVirtExtForced = true;
 #endif /* !VBOX_WITH_RAW_MODE */
+        /* only honor the property value if there was no other reason to enable it */
+        if (!fHwVirtExtForced)
+        {
+            hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_Force, &fHwVirtExtForced); H();
+        }
         InsertConfigInteger(pRoot, "HwVirtExtForced",      fHwVirtExtForced);