vbox的更動 44351 路徑 trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

時間撮記:

2013-1-24 下午12:04:39 (12 年 以前)

作者:

vboxsync

訊息:

PDM,++: Change APIs used by Main from PVM to PUVM.

檔案:

• trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp (修改) (6 筆差異)

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

@@ -2167 +2167 @@
              pDevIns->iInstance, rc));
     return rc;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnGetUVM} */
+static DECLCALLBACK(PUVM) pdmR3DevHlp_GetUVM(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR3DevHlp_GetUVM: caller='%s'/%d: returns %p\n", pDevIns->pReg->szName, pDevIns->iInstance, pDevIns->Internal.s.pVMR3));
+    return pDevIns->Internal.s.pVMR3->pUVM;
 }
 
@@ -3100 +3109 @@
     VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
 
-    int rc = PDMR3RegisterVMMDevHeap(pDevIns->Internal.s.pVMR3, GCPhys, pvHeap, cbSize);
+    int rc = PDMR3VmmDevHeapRegister(pDevIns->Internal.s.pVMR3, GCPhys, pvHeap, cbSize);
     return rc;
 }
@@ -3113 +3122 @@
     VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
 
-    int rc = PDMR3UnregisterVMMDevHeap(pDevIns->Internal.s.pVMR3, GCPhys);
+    int rc = PDMR3VmmDevHeapUnregister(pDevIns->Internal.s.pVMR3, GCPhys);
     return rc;
 }
@@ -3410 +3419 @@
     0,
     0,
-    0,
+    pdmR3DevHlp_GetUVM,
     pdmR3DevHlp_GetVM,
     pdmR3DevHlp_GetVMCPU,
@@ -3429 +3438 @@
 
 
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnGetUVM} */
+static DECLCALLBACK(PUVM) pdmR3DevHlp_Untrusted_GetUVM(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance));
+    return NULL;
+}
 
 
@@ -3631 +3649 @@
     0,
     0,
-    0,
+    pdmR3DevHlp_Untrusted_GetUVM,
     pdmR3DevHlp_Untrusted_GetVM,
     pdmR3DevHlp_Untrusted_GetVMCPU,