Changeset 47991 in vbox

Timestamp:

Aug 22, 2013 2:31:52 PM (12 years ago)

Author:

vboxsync

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

88315

Message:

Main: Made the exclusive HW virtualization use setting global rather than per-VM.

Location:

trunk

Files:

• doc/manual/en_US/user_VBoxManage.xml (modified) (3 diffs)
• include/VBox/settings.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageList.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (4 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (1 diff)
• src/VBox/Main/include/SystemPropertiesImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src/VBox/Main/src-server/MachineImpl.cpp (modified) (5 diffs)
• src/VBox/Main/src-server/SystemPropertiesImpl.cpp (modified) (3 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (8 diffs)

trunk/doc/manual/en_US/user_VBoxManage.xml

@@ -326 +326 @@
 Time offset:     0 ms
 Hardw. virt.ext: on
-Hardw. virt.ext exclusive: on
 Nested Paging:   on
 VT-x VPID:       off
@@ -581 +580 @@
             (Intel VT-x or AMD-V) in the processor of your host system; see
             <xref linkend="hwvirt" />.</para>
-          </listitem>
-
-          <listitem>
-            <para><computeroutput>--hwvirtexexcl on|off</computeroutput>: This
-            specifies whether VirtualBox will make exclusive use of the
-            hardware virtualization extensions (Intel VT-x or AMD-V) in the
-            processor of your host system; see <xref linkend="hwvirt" />. If
-            you wish to simultaneously share these extensions with other
-            hypervisors, then you must disable this setting. Doing so has
-            negative performance implications.</para>
           </listitem>
 
@@ -2486 +2475 @@
 
         <glossentry>
+          <glossterm><computeroutput>hwvirtexclusive</computeroutput></glossterm>
+          <para>This specifies whether VirtualBox will make exclusive use of
+          the hardware virtualization extensions (Intel VT-x or AMD-V) of the
+          host system's processor; see <xref linkend="hwvirt" />. If you wish to
+          share these extensions with other hypervisors running at the same time,
+          you must disable this setting. Doing so has negative performance implications.
+          </para>
+        </glossentry>
+
+
+        <glossentry>
           <glossterm><computeroutput>vrdeauthlibrary</computeroutput></glossterm>
 

trunk/include/VBox/settings.h

@@ -277 +277 @@
     com::Utf8Str            strLoggingLevel;
     uint32_t                ulLogHistoryCount;
+    bool                    fExclusiveHwVirt;
 };
 
@@ -841 +842 @@
 
     bool                fHardwareVirt,
-                        fHardwareVirtExclusive,
                         fNestedPaging,
                         fLargePages,

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

@@ -179 +179 @@
                      "                            [--hpet on|off]\n"
                      "                            [--hwvirtex on|off]\n"
-                     "                            [--hwvirtexexcl on|off]\n"
                      "                            [--nestedpaging on|off]\n"
                      "                            [--largepages on|off]\n"
@@ -635 +634 @@
         RTStrmPrintf(pStrm,
                            "%s setproperty %s     machinefolder default|<folder> |\n"
+                     "                            hwvirtexclusive on|off |\n"
                      "                            vrdeauthlibrary default|<library> |\n"
                      "                            websrvauthlibrary default|null|<library> |\n"

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

@@ -672 +672 @@
     SHOW_BOOLEAN_PROP_EX(machine,   RTCUseUTC,                  "rtcuseutc",            "RTC",          "UTC", "local time");
     SHOW_BOOLEAN_METHOD(machine, GetHWVirtExProperty(HWVirtExPropertyType_Enabled,   &f),   "hwvirtex",     "Hardw. virt.ext");
-    SHOW_BOOLEAN_METHOD(machine, GetHWVirtExProperty(HWVirtExPropertyType_Exclusive, &f),   "hwvirtexexcl", "Hardw. virt.ext exclusive");
     SHOW_BOOLEAN_METHOD(machine, GetHWVirtExProperty(HWVirtExPropertyType_NestedPaging, &f),"nestedpaging", "Nested Paging");
     SHOW_BOOLEAN_METHOD(machine, GetHWVirtExProperty(HWVirtExPropertyType_LargePages, &f),  "largepages",   "Large Pages");

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

@@ -525 +525 @@
     ULONG ulValue;
     LONG64 i64Value;
+    BOOL fValue;
 
     pVirtualBox->COMGETTER(APIVersion)(str.asOutParam());
@@ -607 +608 @@
     systemProperties->COMGETTER(DefaultMachineFolder)(str.asOutParam());
     RTPrintf("Default machine folder:          %ls\n", str.raw());
+    systemProperties->COMGETTER(ExclusiveHwVirt)(&fValue);
+    RTPrintf("Exclusive HW virtualization use: %ls\n", fValue ? L"on" : L"off");
     systemProperties->COMGETTER(DefaultHardDiskFormat)(str.asOutParam());
     RTPrintf("Default hard disk format:        %ls\n", str.raw());

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

@@ -824 +824 @@
             CHECK_ERROR(systemProperties, COMSETTER(DefaultMachineFolder)(Bstr(a->argv[1]).raw()));
     }
+    else if (!strcmp(a->argv[0], "hwvirtexclusive"))
+    {
+        bool   fHwVirtExclusive;
+
+        if (!strcmp(a->argv[1], "on"))
+            fHwVirtExclusive = true;
+        else if (!strcmp(a->argv[1], "off"))
+            fHwVirtExclusive = false;
+        else
+            return errorArgument("Invalid hwvirtexclusive argument '%s'", a->argv[1]);
+        CHECK_ERROR(systemProperties, COMSETTER(ExclusiveHwVirt)(fHwVirtExclusive));
+    }
     else if (   !strcmp(a->argv[0], "vrdeauthlibrary")
              || !strcmp(a->argv[0], "vrdpauthlibrary"))

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

@@ -62 +62 @@
     MODIFYVM_SYNTHCPU,
     MODIFYVM_HWVIRTEX,
-    MODIFYVM_HWVIRTEXEXCLUSIVE,
     MODIFYVM_NESTEDPAGING,
     MODIFYVM_LARGEPAGES,
@@ -224 +223 @@
     { "--synthcpu",                 MODIFYVM_SYNTHCPU,                  RTGETOPT_REQ_BOOL_ONOFF },
     { "--hwvirtex",                 MODIFYVM_HWVIRTEX,                  RTGETOPT_REQ_BOOL_ONOFF },
-    { "--hwvirtexexcl",             MODIFYVM_HWVIRTEXEXCLUSIVE,         RTGETOPT_REQ_BOOL_ONOFF },
     { "--nestedpaging",             MODIFYVM_NESTEDPAGING,              RTGETOPT_REQ_BOOL_ONOFF },
     { "--largepages",               MODIFYVM_LARGEPAGES,                RTGETOPT_REQ_BOOL_ONOFF },
@@ -632 +630 @@
             }
 
-            case MODIFYVM_HWVIRTEXEXCLUSIVE:
-            {
-                CHECK_ERROR(machine, SetHWVirtExProperty(HWVirtExPropertyType_Exclusive, ValueUnion.f));
-                break;
-            }
-
             case MODIFYVM_SETCPUID:
             {

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

@@ -954 +954 @@
   <enum
     name="HWVirtExPropertyType"
-    uuid="39463ecd-b4b8-401f-b168-76cfa87e11f0"
+    uuid="411ad0ea-aeeb-44cb-9d03-1624d0d025ac"
     >
     <desc>
@@ -970 +970 @@
       </desc>
     </const>
-    <const name="Exclusive"             value="2">
-      <desc>
-        Whether hardware virtualization is used exclusively by VirtualBox. When enabled,
-        VirtualBox assumes it can acquire full and exclusive access to the VT-x or AMD-V
-        feature of the host. To share these with other hypervisors, you must disable this property.
-      </desc>
-    </const>
-    <const name="VPID"                  value="3">
+    <const name="VPID"                  value="2">
       <desc>
         Whether VT-x VPID is enabled. If this extension is not available, it will not be used.
       </desc>
     </const>
-    <const name="NestedPaging"          value="4">
+    <const name="NestedPaging"          value="3">
       <desc>
         Whether Nested Paging is enabled. If this extension is not available, it will not be used.
       </desc>
     </const>
-    <const name="UnrestrictedExecution" value="5">
+    <const name="UnrestrictedExecution" value="4">
       <desc>
         Whether VT-x unrestricted execution is enabled. If this feature is not available, it will not be used.
       </desc>
     </const>
-    <const name="LargePages"            value="6">
+    <const name="LargePages"            value="5">
       <desc>
         Whether large page allocation is enabled; requires nested paging and a 64-bit host.
       </desc>
     </const>
-    <const name="Force"                 value="7">
+    <const name="Force"                 value="6">
       <desc>
         Whether the VM should fail to start if hardware virtualization (VT-x/AMD-V) cannot be used. If
@@ -8728 +8721 @@
     name="ISystemProperties"
     extends="$unknown"
-    uuid="856be1bc-0525-46b1-a27a-fe17d9a4939f"
+    uuid="1254a96a-ae57-4484-946a-22d86c1f98af"
     wsmap="managed"
     >
@@ -8793 +8786 @@
         possible to include all possible devices to the boot list.
         <see><link to="IMachine::setBootOrder"/></see>
+      </desc>
+    </attribute>
+
+    <attribute name="exclusiveHwVirt" type="boolean">
+      <desc>
+        Exclusive use of hardware virtualization by VirtualBox. When enabled,
+        VirtualBox assumes it can obtain full and exclusive access to the VT-x
+        or AMD-V feature of the host. To share hardware virtualization with
+        other hypervisors, this property must be disabled.
       </desc>
     </attribute>

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

@@ -270 +270 @@
         ULONG               mMonitorCount;
         BOOL                mHWVirtExEnabled;
-        BOOL                mHWVirtExExclusive;
         BOOL                mHWVirtExNestedPagingEnabled;
         BOOL                mHWVirtExLargePagesEnabled;

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

@@ -70 +70 @@
     STDMETHOD(COMGETTER(ParallelPortCount))(ULONG *count);
     STDMETHOD(COMGETTER(MaxBootPosition))(ULONG *aMaxBootPosition);
+    STDMETHOD(COMGETTER(ExclusiveHwVirt))(BOOL *aExclusiveHwVirt);
+    STDMETHOD(COMSETTER(ExclusiveHwVirt))(BOOL aExclusiveHwVirt);
     STDMETHOD(COMGETTER(LoggingLevel))(BSTR *aLoggingLevel);
     STDMETHOD(COMSETTER(LoggingLevel))(IN_BSTR aLoggingLevel);

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -988 +988 @@
         /* HWVirtEx exclusive mode */
         BOOL fHMExclusive = true;
-        hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_Exclusive, &fHMExclusive); H();
+        hrc = systemProperties->COMGETTER(ExclusiveHwVirt)(&fHMExclusive);                  H();
         InsertConfigInteger(pHM, "Exclusive", fHMExclusive);
 

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

@@ -181 +181 @@
     mHWVirtExUXEnabled = true;
     mHWVirtExForceEnabled = false;
-#if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS)
-    mHWVirtExExclusive = false;
-#else
-    mHWVirtExExclusive = true;
-#endif
 #if HC_ARCH_BITS == 64 || defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN)
     mPAEEnabled = true;
@@ -2540 +2535 @@
             break;
 
-        case HWVirtExPropertyType_Exclusive:
-            *aVal = mHWData->mHWVirtExExclusive;
-            break;
-
         case HWVirtExPropertyType_VPID:
             *aVal = mHWData->mHWVirtExVPIDEnabled;
@@ -2589 +2580 @@
             mHWData.backup();
             mHWData->mHWVirtExEnabled = !!aVal;
-            break;
-
-        case HWVirtExPropertyType_Exclusive:
-            setModified(IsModified_MachineData);
-            mHWData.backup();
-            mHWData->mHWVirtExExclusive = !!aVal;
             break;
 
@@ -9159 +9144 @@
 
         mHWData->mHWVirtExEnabled             = data.fHardwareVirt;
-        mHWData->mHWVirtExExclusive           = data.fHardwareVirtExclusive;
         mHWData->mHWVirtExNestedPagingEnabled = data.fNestedPaging;
         mHWData->mHWVirtExLargePagesEnabled   = data.fLargePages;
@@ -10484 +10468 @@
         // CPU
         data.fHardwareVirt          = !!mHWData->mHWVirtExEnabled;
-        data.fHardwareVirtExclusive = !!mHWData->mHWVirtExExclusive;
         data.fNestedPaging          = !!mHWData->mHWVirtExNestedPagingEnabled;
         data.fLargePages            = !!mHWData->mHWVirtExLargePagesEnabled;

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

@@ -98 +98 @@
 
     m->ulLogHistoryCount = 3;
+
+
+    /* On Windows and OS X, HW virtualization use isn't exclusive by
+     * default so that VT-x or AMD-V can be shared with other
+     * hypervisors without requiring user intervention.
+     */
+#if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS)
+    m->fExclusiveHwVirt = false;
+#else
+    m->fExclusiveHwVirt = true;
+#endif
 
     HRESULT rc = S_OK;
@@ -314 +325 @@
 }
 
+
+STDMETHODIMP SystemProperties::COMGETTER(ExclusiveHwVirt)(BOOL *aExclusiveHwVirt)
+{
+    CheckComArgOutPointerValid(aExclusiveHwVirt);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aExclusiveHwVirt = m->fExclusiveHwVirt;
+
+    return S_OK;
+}
+
+STDMETHODIMP SystemProperties::COMSETTER(ExclusiveHwVirt)(BOOL aExclusiveHwVirt)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    m->fExclusiveHwVirt = !!aExclusiveHwVirt;
+    alock.release();
+
+    // VirtualBox::saveSettings() needs vbox write lock
+    AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
+    HRESULT rc = mParent->saveSettings();
+
+    return rc;
+}
 
 STDMETHODIMP SystemProperties::GetMaxNetworkAdapters(ChipsetType_T aChipset, ULONG *count)
@@ -1126 +1167 @@
 
     m->ulLogHistoryCount = data.ulLogHistoryCount;
+    m->fExclusiveHwVirt  = data.fExclusiveHwVirt;
 
     rc = setAutostartDatabasePath(data.strAutostartDatabasePath);

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1440 +1440 @@
                         pelmGlobalChild->getAttributeValue("autostartDatabasePath", systemProperties.strAutostartDatabasePath);
                         pelmGlobalChild->getAttributeValue("defaultFrontend", systemProperties.strDefaultFrontend);
+                        pelmGlobalChild->getAttributeValue("exclusiveHwVirt", systemProperties.fExclusiveHwVirt);
                     }
                     else if (pelmGlobalChild->nameEquals("ExtraData"))
@@ -1507 +1508 @@
 }
 
+
 /**
  * Called from the IVirtualBox interface to write out VirtualBox.xml. This
@@ -1654 +1656 @@
     if (systemProperties.strDefaultFrontend.length())
         pelmSysProps->setAttribute("defaultFrontend", systemProperties.strDefaultFrontend);
+    pelmSysProps->setAttribute("exclusiveHwVirt", systemProperties.fExclusiveHwVirt);
 
     buildUSBDeviceFilters(*pelmGlobal->createChild("USBDeviceFilters"),
@@ -1840 +1843 @@
 }
 
-// use a define for the platform-dependent default value of
-// hwvirt exclusivity, since we'll need to check that value
-// in bumpSettingsVersionIfNeeded()
-#if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS)
-    #define HWVIRTEXCLUSIVEDEFAULT false
-#else
-    #define HWVIRTEXCLUSIVEDEFAULT true
-#endif
-
 Hardware::Hardware()
         : strVersion("1"),
           fHardwareVirt(true),
-          fHardwareVirtExclusive(HWVIRTEXCLUSIVEDEFAULT),
           fNestedPaging(true),
           fVPID(true),
@@ -1923 +1916 @@
                   && (uuid                      == h.uuid)
                   && (fHardwareVirt             == h.fHardwareVirt)
-                  && (fHardwareVirtExclusive    == h.fHardwareVirtExclusive)
                   && (fNestedPaging             == h.fNestedPaging)
                   && (fLargePages               == h.fLargePages)
@@ -2653 +2645 @@
             {
                 pelmCPUChild->getAttributeValue("enabled", hw.fHardwareVirt);
-                pelmCPUChild->getAttributeValue("exclusive", hw.fHardwareVirtExclusive);        // settings version 1.9
             }
             if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExNestedPaging")))
@@ -3925 +3916 @@
     xml::ElementNode *pelmHwVirtEx = pelmCPU->createChild("HardwareVirtEx");
     pelmHwVirtEx->setAttribute("enabled", hw.fHardwareVirt);
-    if (m->sv >= SettingsVersion_v1_9)
-        pelmHwVirtEx->setAttribute("exclusive", hw.fHardwareVirtExclusive);
 
     pelmCPU->createChild("HardwareVirtExNestedPaging")->setAttribute("enabled", hw.fNestedPaging);
@@ -5676 +5665 @@
     if (    (m->sv < SettingsVersion_v1_9)
          && (    (hardwareMachine.firmwareType >= FirmwareType_EFI)
-              || (hardwareMachine.fHardwareVirtExclusive != HWVIRTEXCLUSIVEDEFAULT)
               || machineUserData.fTeleporterEnabled
               || machineUserData.uTeleporterPort