Changeset 21446 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 9, 2009 3:09:57 PM (16 years ago)

Author:

vboxsync

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

49854

Message:

API/Machine+SystemProperties: get rid of the tri-state bool controlling hwvirtex

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManage.cpp (modified) (1 diff)
• VBoxManage/VBoxManageHelp.cpp (modified) (2 diffs)
• VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• VBoxManage/VBoxManageList.cpp (modified) (1 diff)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• VBoxSDL/VBoxSDL.cpp (modified) (3 diffs)
• VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• VirtualBox/src/VBoxSettingsDialogSpecific.cpp (modified) (1 diff)
• VirtualBox/src/VBoxVMSettingsSystem.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -1412 +1412 @@
         else
             CHECK_ERROR(systemProperties, COMSETTER(WebServiceAuthLibrary)(Bstr(a->argv[1])));
-    }
-    else if (!strcmp(a->argv[0], "hwvirtexenabled"))
-    {
-        if (!strcmp(a->argv[1], "yes"))
-            CHECK_ERROR(systemProperties, COMSETTER(HWVirtExEnabled)(TRUE));
-        else if (!strcmp(a->argv[1], "no"))
-            CHECK_ERROR(systemProperties, COMSETTER(HWVirtExEnabled)(FALSE));
-        else
-            return errorArgument("Invalid value '%s' for hardware virtualization extension flag", a->argv[1]);
     }
     else if (!strcmp(a->argv[0], "loghistorycount"))

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -131 +131 @@
                  "                            [--ioapic on|off]\n"
                  "                            [--pae on|off]\n"
-                 "                            [--hwvirtex on|off|default]\n"
+                 "                            [--hwvirtex on|off]\n"
                  "                            [--nestedpaging on|off]\n"
                  "                            [--vtxvpid on|off]\n"
@@ -431 +431 @@
                  "                            vrdpauthlibrary default|<library> |\n"
                  "                            websrvauthlibrary default|null|<library> |\n"
-                 "                            hwvirtexenabled yes|no\n"
                  "                            loghistorycount <value>\n"
                  "\n");

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -343 +343 @@
         RTPrintf("Time offset:     %lld ms\n", timeOffset);
 
-    TSBool_T hwVirtExEnabled;
+    BOOL hwVirtExEnabled;
     machine->COMGETTER(HWVirtExEnabled)(&hwVirtExEnabled);
-    if (hwVirtExEnabled == TSBool_Default)
-    {
-        BOOL fHWVirtExEnabled;
-        ComPtr<ISystemProperties> systemProperties;
-        virtualBox->COMGETTER(SystemProperties)(systemProperties.asOutParam());
-        systemProperties->COMGETTER(HWVirtExEnabled)(&fHWVirtExEnabled);
-        if (details == VMINFO_MACHINEREADABLE)
-            RTPrintf("hwvirtex=\"default\"\n");
-        else
-            RTPrintf("Hardw. virt.ext: Default (%s)\n", fHWVirtExEnabled ? "on" : "off");
-    }
-    else
-    {
-        if (details == VMINFO_MACHINEREADABLE)
-            RTPrintf("hwvirtex=\"%s\"\n", hwVirtExEnabled == TSBool_True ? "on" : "off");
-        else
-            RTPrintf("Hardw. virt.ext: %s\n", hwVirtExEnabled == TSBool_True ? "on" : "off");
-    }
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("hwvirtex=\"%s\"\n", hwVirtExEnabled ? "on" : "off");
+    else
+        RTPrintf("Hardw. virt.ext: %s\n", hwVirtExEnabled ? "on" : "off");
     BOOL HWVirtExNestedPagingEnabled;
     machine->COMGETTER(HWVirtExNestedPagingEnabled)(&HWVirtExNestedPagingEnabled);

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -763 +763 @@
             systemProperties->COMGETTER(WebServiceAuthLibrary)(str.asOutParam());
             RTPrintf("Webservice auth. library:    %lS\n", str.raw());
-            systemProperties->COMGETTER(HWVirtExEnabled)(&flag);
-            RTPrintf("Hardware virt. extensions:   %s\n", flag ? "yes" : "no");
             systemProperties->COMGETTER(LogHistoryCount)(&ulValue);
             RTPrintf("Log history count:           %u\n", ulValue);

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -938 +938 @@
             if (!strcmp(hwvirtex, "on"))
             {
-                CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TSBool_True));
+                CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TRUE));
             }
             else if (!strcmp(hwvirtex, "off"))
             {
-                CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TSBool_False));
-            }
-            else if (!strcmp(hwvirtex, "default"))
-            {
-                CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TSBool_Default));
+                CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(FALSE));
             }
             else

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1073 +1073 @@
     unsigned fPATM  = ~0U;
     unsigned fCSAM  = ~0U;
-    TSBool_T fHWVirt = TSBool_Default;
+    unsigned fHWVirt = ~0U;
     uint32_t u32WarpDrive = 0;
 #endif
@@ -1587 +1587 @@
         else if (   !strcmp(argv[curArg], "--hwvirtex")
                  || !strcmp(argv[curArg], "-hwvirtex"))
-            fHWVirt = TSBool_True;
+            fHWVirt = true;
         else if (   !strcmp(argv[curArg], "--nohwvirtex")
                  || !strcmp(argv[curArg], "-nohwvirtex"))
-            fHWVirt = TSBool_False;
+            fHWVirt = false;
         else if (   !strcmp(argv[curArg], "--warpdrive")
                  || !strcmp(argv[curArg], "-warpdrive"))
@@ -2149 +2149 @@
         gMachineDebugger->COMSETTER(CSAMEnabled)(fCSAM);
     }
-    if (fHWVirt != TSBool_Default)
+    if (fHWVirt != ~0U)
     {
         gMachine->COMSETTER(HWVirtExEnabled)(fHWVirt);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -1482 +1482 @@
 
         /* VT-x/AMD-V */
-        QString virt = aMachine.GetHWVirtExEnabled() == KTSBool_True ?
-                       tr ("Enabled", "details report (VT-x/AMD-V)") :
-                       tr ("Disabled", "details report (VT-x/AMD-V)");
+        QString virt = aMachine.GetHWVirtExEnabled()
+            ? tr ("Enabled", "details report (VT-x/AMD-V)")
+            : tr ("Disabled", "details report (VT-x/AMD-V)");
 
         /* Nested Paging */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSettingsDialogSpecific.cpp

@@ -433 +433 @@
     if (generalPage && systemPage &&
         generalPage->is64BitOSTypeSelected() && !systemPage->isHWVirtExEnabled())
-        mMachine.SetHWVirtExEnabled (KTSBool_True);
+        mMachine.SetHWVirtExEnabled (true);
 
     /* Clear the "GUI_FirstRun" extra data key in case if the boot order

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsSystem.cpp

@@ -175 +175 @@
     /* VT-x/AMD-V */
     mCbVirt->setEnabled (fVTxAMDVSupported);
-    mCbVirt->setChecked (aMachine.GetHWVirtExEnabled() == KTSBool_True);
+    mCbVirt->setChecked (aMachine.GetHWVirtExEnabled());
 
     /* Nested Paging */
     mCbNestedPaging->setEnabled (fVTxAMDVSupported &&
-                                 aMachine.GetHWVirtExEnabled() == KTSBool_True);
+                                 aMachine.GetHWVirtExEnabled());
     mCbNestedPaging->setChecked (aMachine.GetHWVirtExNestedPagingEnabled());
 
@@ -232 +232 @@
     /* VT-x/AMD-V */
     mMachine.SetHWVirtExEnabled (mCbVirt->checkState() == Qt::Checked ||
-                                 mSlCPU->value() > 1 ?
-                                 KTSBool_True : KTSBool_False);
+                                 mSlCPU->value() > 1);
 
     /* Nested Paging */