儲存庫 vbox 的更動 60387

時間撮記:

2016-4-8 上午08:32:13 (9 年 以前)

作者:

vboxsync

訊息:

PDM: Call pfnInitComplete after both ring-0 and raw-mode is fully initialized. Used to call this immediately after the devices were initialized.

位置:

trunk

檔案:

• include/VBox/vmm/pdmapi.h (修改) (3 筆差異)
• include/VBox/vmm/pdmdev.h (修改) (1 筆差異)
• src/VBox/VMM/VMMR3/PDM.cpp (修改) (1 筆差異)
• src/VBox/VMM/VMMR3/PDMDevice.cpp (修改) (2 筆差異)
• src/VBox/VMM/VMMR3/VM.cpp (修改) (1 筆差異)
• src/VBox/VMM/include/PDMInternal.h (修改) (1 筆差異)

trunk/include/VBox/vmm/pdmapi.h

@@ -32 +32 @@
 
 #include <VBox/vmm/pdmcommon.h>
+#ifdef IN_RING3
+# include <VBox/vmm/vmapi.h>
+#endif
 #include <VBox/sup.h>
 
@@ -60 +63 @@
 
 
+#if defined(IN_RING3) || defined(DOXYGEN_RUNNING)
 /** @defgroup grp_pdm_r3    The PDM Host Context Ring-3 API
  * @{
  */
-
 VMMR3_INT_DECL(int)     PDMR3InitUVM(PUVM pUVM);
 VMMR3_INT_DECL(int)     PDMR3LdrLoadVMMR0U(PUVM pUVM);
 VMMR3_INT_DECL(int)     PDMR3Init(PVM pVM);
+VMMR3_INT_DECL(int)     PDMR3InitCompleted(PVM pVM, VMINITCOMPLETED enmWhat);
 VMMR3DECL(void)         PDMR3PowerOn(PVM pVM);
 VMMR3_INT_DECL(void)    PDMR3ResetCpu(PVMCPU pVCpu);
@@ -161 +165 @@
 VMMR3_INT_DECL(int)     PDMR3TracingQueryConfig(PVM pVM, char *pszConfig, size_t cbConfig);
 /** @} */
+#endif /* IN_RING3 */
 
 

trunk/include/VBox/vmm/pdmdev.h

@@ -227 +227 @@
 
 /**
- * Init complete notification.
+ * Init complete notification (after ring-0 & RC init since 5.1).
+ *
  * This can be done to do communication with other devices and other
  * initialization which requires everything to be in place.

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

@@ -441 +441 @@
     LogFlow(("PDMR3Init: returns %Rrc\n", rc));
     return rc;
+}
+
+
+/**
+ * Init phase completed callback.
+ *
+ * We use this for calling PDMDEVREG::pfnInitComplete callback after everything
+ * else has been initialized.
+ *
+ * @returns VBox status code.
+ * @param   pVM         The cross context VM structure.
+ * @param   enmWhat     The phase that was completed.
+ */
+VMMR3_INT_DECL(int) PDMR3InitCompleted(PVM pVM, VMINITCOMPLETED enmWhat)
+{
+#ifdef VBOX_WITH_RAW_MODE
+    if (enmWhat == VMINITCOMPLETED_RC)
+#else
+    if (enmWhat == VMINITCOMPLETED_RING0)
+#endif
+        return pdmR3DevInitComplete(pVM);
+    return VINF_SUCCESS;
 }
 

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

@@ -412 +412 @@
 #endif
 
+    LogFlow(("pdmR3DevInit: returns %Rrc\n", VINF_SUCCESS));
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Performs the init complete callback after ring-0 and raw-mode has been
+ * initialized.
+ *
+ * @returns VBox status code.
+ * @param   pVM     The cross context VM structure.
+ */
+int pdmR3DevInitComplete(PVM pVM)
+{
+    int rc;
 
     /*
@@ -447 +462 @@
 
 #ifdef VBOX_WITH_USB
-    /* ditto for USB Devices. */
     rc = pdmR3UsbVMInitComplete(pVM);
     if (RT_FAILURE(rc))
+    {
+        Log(("pdmR3DevInit: returns %Rrc\n", rc));
         return rc;
+    }
 #endif
 

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

@@ -1194 +1194 @@
     }
 #endif
+    if (RT_SUCCESS(rc))
+        rc = PDMR3InitCompleted(pVM, enmWhat);
     return rc;
 }

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -1276 +1276 @@
 
 int         pdmR3DevInit(PVM pVM);
+int         pdmR3DevInitComplete(PVM pVM);
 PPDMDEV     pdmR3DevLookup(PVM pVM, const char *pszName);
 int         pdmR3DevFindLun(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMLUN *ppLun);