Changeset 52090 in vbox for trunk/src

Timestamp:

Jul 18, 2014 6:37:32 AM (11 years ago)

Author:

vboxsync

Message:

Main, Fe/Qt4: Added method to get effective paravirt. provider in MachineImpl; adjusted GUI and ConsoleImpl2 to use the new method as required.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/MachineImpl.h (modified) (1 diff)
• Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/src-server/MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp

@@ -342 +342 @@
             if (machine().GetCPUProperty(KCPUPropertyType_PAE))
                 acceleration << QApplication::translate("UIGDetails", "PAE/NX", "details (system)");
-            switch (machine().GetParavirtProvider())
-            {
-                case KParavirtProvider_Default: acceleration << QApplication::translate("UIGDetails", "Default Paravirtualization", "details (system)"); break;
-                case KParavirtProvider_Legacy:  acceleration << QApplication::translate("UIGDetails", "Legacy Paravirtualization", "details (system)"); break;
+            switch (machine().GetEffectiveParavirtProvider())
+            {
                 case KParavirtProvider_Minimal: acceleration << QApplication::translate("UIGDetails", "Minimal Paravirtualization", "details (system)"); break;
                 case KParavirtProvider_HyperV:  acceleration << QApplication::translate("UIGDetails", "Hyper-V Paravirtualization", "details (system)"); break;

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

@@ -4206 +4206 @@
   <interface
     name="IMachine" extends="$unknown"
-    uuid="45b0357d-28f4-4f90-b02c-13f2940efdda"
+    uuid="5cabbce0-6565-4713-a7fd-1f8c70e51797"
     wsmap="managed"
     wrap-hint-server-addinterfaces="IInternalMachineControl"
@@ -7200 +7200 @@
         <desc>
           Status of the CPU.
+        </desc>
+      </param>
+    </method>
+
+    <method name="getEffectiveParavirtProvider"  const="yes">
+      <desc>
+        Returns the effective paravirtualization provider for this VM.
+      </desc>
+      <param name="paravirtProvider" type="ParavirtProvider" dir="return">
+        <desc>
+          The effective paravirtualization provider for this VM.
         </desc>
       </param>

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

@@ -1114 +1114 @@
     HRESULT getCPUStatus(ULONG aCpu,
                          BOOL *aAttached);
+    HRESULT getEffectiveParavirtProvider(ParavirtProvider_T *aParavirtProvider);
     HRESULT queryLogFilename(ULONG aIdx,
                              com::Utf8Str &aFilename);

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

@@ -874 +874 @@
 
     ParavirtProvider_T paravirtProvider;
-    hrc = pMachine->COMGETTER(ParavirtProvider)(&paravirtProvider);                         H();
+    hrc = pMachine->GetEffectiveParavirtProvider(&paravirtProvider);                        H();
 
     ChipsetType_T chipsetType;
@@ -1163 +1163 @@
                 fGimDeviceNeeded = false;
                 break;
-
-            case ParavirtProvider_Default:
-            {
-                if (fOsXGuest)
-                {
-                    pcszParavirtProvider = "Minimal";
-                    fGimDeviceNeeded = false;
-                }
-#if 0           /* Activate this soon. */
-                else if (  osTypeId == "Windows7"
-                        || osTypeId == "Windows7_64"
-                        || osTypeId == "Windows8"
-                        || osTypeId == "Windows8_64"
-                        || osTypeId == "Windows81"
-                        || osTypeId == "Windows81_64")
-                {
-                    pcszParavirtProvider = "HyperV";
-                }
-#endif
-                else
-                {
-                    pcszParavirtProvider = "None";
-                    fGimDeviceNeeded = false;
-                }
-                break;
-            }
-
-            case ParavirtProvider_Legacy:
-            {
-                if (fOsXGuest)
-                    pcszParavirtProvider = "Minimal";
-                else
-                    pcszParavirtProvider = "None";
-                fGimDeviceNeeded = false;
-                break;
-            }
 
             case ParavirtProvider_Minimal:

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

@@ -1237 +1237 @@
     }
 
+    return S_OK;
+}
+
+HRESULT Machine::getEffectiveParavirtProvider(ParavirtProvider_T *aParavirtProvider)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aParavirtProvider = mHWData->mParavirtProvider;
+    switch (mHWData->mParavirtProvider)
+    {
+        case ParavirtProvider_None:
+        case ParavirtProvider_HyperV:
+        case ParavirtProvider_Minimal:
+            break;
+
+        /* Resolve dynamic provider types to the effective types. */
+        default:
+        {
+            ComPtr<IGuestOSType> ptrGuestOSType;
+            HRESULT hrc2 = mParent->GetGuestOSType(Bstr(mUserData->s.strOsType).raw(), ptrGuestOSType.asOutParam());
+            AssertMsgReturn(SUCCEEDED(hrc2), ("Failed to get guest OS type. hrc2=%Rhrc\n", hrc2), hrc2);
+
+            Bstr guestTypeFamilyId;
+            hrc2 = ptrGuestOSType->COMGETTER(FamilyId)(guestTypeFamilyId.asOutParam());
+            AssertMsgReturn(SUCCEEDED(hrc2), ("Failed to get guest family. hrc2=%Rhrc\n", hrc2), hrc2);
+            BOOL fOsXGuest = guestTypeFamilyId == Bstr("MacOS");
+
+            switch (mHWData->mParavirtProvider)
+            {
+                case ParavirtProvider_Legacy:
+                {
+                    if (fOsXGuest)
+                        *aParavirtProvider = ParavirtProvider_Minimal;
+                    else
+                        *aParavirtProvider = ParavirtProvider_None;
+                    break;
+                }
+
+                case ParavirtProvider_Default:
+                {
+                    if (fOsXGuest)
+                        *aParavirtProvider = ParavirtProvider_Minimal;
+#if 0           /* Activate this soon. */
+                    else if (   mUserData->s.strOsType == "Windows81"
+                             || mUserData->s.strOsType == "Windows81_64"
+                             || mUserData->s.strOsType == "Windows8"
+                             || mUserData->s.strOsType == "Windows8_64"
+                             || mUserData->s.strOsType == "Windows7"
+                             || mUserData->s.strOsType == "Windows7_64"
+                             || mUserData->s.strOsType == "WindowsVista"
+                             || mUserData->s.strOsType == "WindowsVista_64"
+                             || mUserData->s.strOsType == "Windows2012"
+                             || mUserData->s.strOsType == "Windows2012_64"
+                             || mUserData->s.strOsType == "Windows2008"
+                             || mUserData->s.strOsType == "Windows2008_64")
+                    {
+                        *aParavirtProvider = ParavirtProvider_HyperV;
+                    }
+#endif
+                    else
+                        *aParavirtProvider = ParavirtProvider_None;
+                    break;
+                }
+            }
+            break;
+        }
+    }
+
+    Assert(   *aParavirtProvider == ParavirtProvider_None
+           || *aParavirtProvider == ParavirtProvider_Minimal
+           || *aParavirtProvider == ParavirtProvider_HyperV);
     return S_OK;
 }