Changeset 52675 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Sep 10, 2014 1:24:03 PM (10 years ago)

Author:

vboxsync

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

95998

Message:

VMM/GIM: Fix circular dependency between PDM and GIM init. routines.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GIM.cpp (modified) (2 diffs)
• GIMMinimal.cpp (modified) (2 diffs)
• VM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/GIM.cpp

@@ -148 +148 @@
 }
 
-#if 0
-VMM_INT_DECL(int) GIMR3InitFinalize(PVM pVM)
+
+VMMR3_INT_DECL(int) GIMR3InitFinalize(PVM pVM)
 {
     LogFlow(("GIMR3InitFinalize\n"));
@@ -156 +156 @@
         return VINF_SUCCESS;
 
+    int rc = VINF_SUCCESS;
     switch (pVM->gim.s.enmProviderId)
     {
         case GIMPROVIDERID_MINIMAL:
         {
-            GIMR3MinimalInitFinalize(pVM);
-            break;
-        }
-
-        case GIMPROVIDERID_HYPERV:
-        {
-            GIMR3HvInitFinalize(pVM);
-            break;
-        }
-
-        case GIMPROVIDERID_KVM:            /** @todo KVM. */
+            rc = GIMR3MinimalInitFinalize(pVM);
+            break;
+        }
+
         default:
-        {
-            AssertMsgFailed(("Invalid provider Id %#x\n", pVM->gim.s.enmProviderId));
-            break;
-        }
-    }
-}
-#endif
+            break;
+    }
+    return rc;
+}
 
 

trunk/src/VBox/VMM/VMMR3/GIMMinimal.cpp

@@ -46 +46 @@
     CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_HVP);
 
+    return VINF_SUCCESS;
+}
+
+
+VMMR3_INT_DECL(int) GIMR3MinimalInitFinalize(PVM pVM)
+{
     /*
      * Expose a generic hypervisor-agnostic leaf (originally defined VMware).
      * The leaves range from  0x40000010 to 0x400000FF.
+     *
+     * This is done in the finalize routine as we need PDM to be
+     * initialized (otherwise PDMApicGetTimerFreq() would fail).
      */
     CPUMCPUIDLEAF HyperLeaf;
@@ -83 +92 @@
 }
 
-
 VMMR3_INT_DECL(void) GIMR3MinimalRelocate(PVM pVM, RTGCINTPTR offDelta)
 {

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -1012 +1012 @@
 #endif
                                                                             if (RT_SUCCESS(rc))
+                                                                                rc = GIMR3InitFinalize(pVM);
+                                                                            if (RT_SUCCESS(rc))
                                                                             {
                                                                                 PGMR3MemSetup(pVM, false /*fAtReset*/);