Changeset 2291

Timestamp:

04/21/07 01:26:42 (2 years ago)

Author:

vboxsync

Message:

More ring-0/ring-3 type safety (callbacks and PDM symbol resolving).

Files:

• trunk/include/VBox/pdm.h (modified) (6 diffs)
• trunk/include/iprt/cdefs.h (modified) (2 diffs)
• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/PDMDevice.cpp (modified) (14 diffs)
• trunk/src/VBox/VMM/PDMLdr.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/PGMBth.h (modified) (1 diff)
• trunk/src/VBox/VMM/PGMGst.h (modified) (1 diff)
• trunk/src/VBox/VMM/PGMHandler.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/PGMPool.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/PGMShw.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMM.cpp (modified) (1 diff)

trunk/include/VBox/pdm.h

@@ -3417 +3417 @@
-} PDMPCIHLPR0;
-/** Pointer to PCI helpers. */
-HC
+R0
-/** Pointer to const PCI helpers. */
-HC
+R0
-
-/** Current PDMPCIHLPR0 version number. */
@@ -3647 +3647 @@
-
-/** Pointer to PIC R0 helpers. */
-HC
+R0
-/** Pointer to const PIC R0 helpers. */
-HC
+R0
-
-/** Current PDMPICHLPR0 version number. */
@@ -3949 +3949 @@
-typedef GCPTRTYPE(PDMAPICHLPR0 *) PPDMAPICHLPR0;
-/** Pointer to const APIC helpers. */
-HC
+R0
-
-/** Current PDMAPICHLPR0 version number. */
@@ -4171 +4171 @@
-} PDMIOAPICHLPR0;
-/** Pointer to IOAPIC R0 helpers. */
-HCPTRTYPE(PDMAPICHLPGC *)
+R0PTRTYPE(PDMAPICHLPGC *) 
-/** Pointer to const IOAPIC helpers. */
-HC
+R0
-
-/** Current PDMIOAPICHLPR0 version number. */
@@ -6597 +6597 @@
- * @param   ppvValue        Where to store the symbol value.
- */
-void **
+PRTR0PTR 
-
-/**
@@ -6609 +6609 @@
- * @param   ppvValue        Where to store the symbol value.
- */
-void **
+PRTR0PTR 
-
-/**

trunk/include/iprt/cdefs.h

@@ -471 +471 @@
-# define DECLR3CALLBACKMEMBER(type, name, args)  type (RTCALL * name) args
-#else
-HC
+R3
-#endif
-
@@ -495 +495 @@
-# define DECLR0CALLBACKMEMBER(type, name, args)  type (RTCALL * name) args
-#else
-HC
+R0
-#endif
-

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -4172 +4172 @@
-
-#ifdef PCNET_NO_POLLING
-(void **)
+
-    if (VBOX_SUCCESS(rc))
-    {

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -540 +540 @@
-
-    R0PTRTYPE(PCPDMDEVHLPR0) pDevHlpR0;
-(void **)
+
-    AssertReleaseRCReturn(rc, rc);
-
@@ -1230 +1230 @@
-        if (pszIn)
-        {
-(void **)
+
-            AssertMsgRC(rc, ("Failed to resolve %s.%s (pszIn)\n", pDevIns->pDevReg->szR0Mod, pszIn));
-        }
@@ -1236 +1236 @@
-        if (pszOut && VBOX_SUCCESS(rc))
-        {
-(void **)
+
-            AssertMsgRC(rc, ("Failed to resolve %s.%s (pszOut)\n", pDevIns->pDevReg->szR0Mod, pszOut));
-        }
@@ -1242 +1242 @@
-        if (pszInStr && VBOX_SUCCESS(rc))
-        {
-(void **)
+
-            AssertMsgRC(rc, ("Failed to resolve %s.%s (pszInStr)\n", pDevIns->pDevReg->szR0Mod, pszInStr));
-        }
@@ -1248 +1248 @@
-        if (pszOutStr && VBOX_SUCCESS(rc))
-        {
-(void **)
+
-            AssertMsgRC(rc, ("Failed to resolve %s.%s (pszOutStr)\n", pDevIns->pDevReg->szR0Mod, pszOutStr));
-        }
@@ -1373 +1373 @@
-        R0PTRTYPE(PFNIOMMMIOWRITE) pfnR0PtrWrite = 0;
-        if (pszWrite)
-(void **)
+
-        R0PTRTYPE(PFNIOMMMIOREAD) pfnR0PtrRead = 0;
-        int rc2 = VINF_SUCCESS;
-        if (pszRead)
-(void **)
+
-        R0PTRTYPE(PFNIOMMMIOFILL) pfnR0PtrFill = 0;
-        int rc3 = VINF_SUCCESS;
-        if (pszFill)
-(void **)
+
-        if (VBOX_SUCCESS(rc) && VBOX_SUCCESS(rc2) && VBOX_SUCCESS(rc3))
-            rc = IOMMMIORegisterR0(pDevIns->Internal.s.pVMHC, pDevIns, GCPhysStart, cbRange, pvUser, pfnR0PtrWrite, pfnR0PtrRead, pfnR0PtrFill, pszDesc);
@@ -2381 +2381 @@
-        &&  pPciBusReg->pszSetIrqR0)
-    {
-(void **)
+
-        AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pPciBusReg->pszSetIrqR0, rc));
-        if (VBOX_FAILURE(rc))
@@ -2518 +2518 @@
-        &&  pPicReg->pszSetIrqR0)
-    {
-(void **)
+
-        AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pPicReg->pszSetIrqR0, rc));
-        if (VBOX_SUCCESS(rc))
-        {
-(void **)
+
-            AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pPicReg->pszGetInterruptR0, rc));
-        }
@@ -2714 +2714 @@
-        &&  pApicReg->pszGetInterruptR0)
-    {
-(void **)
+
-        AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pApicReg->pszGetInterruptR0, rc));
-        if (RT_SUCCESS(rc))
-        {
-(void **)
+
-            AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pApicReg->pszSetBaseR0, rc));
-        }
-        if (RT_SUCCESS(rc))
-        {
-(void **)
+
-            AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pApicReg->pszGetBaseR0, rc));
-        }
-        if (RT_SUCCESS(rc))
-        {
-(void **)
+
-            AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pApicReg->pszSetTPRR0, rc));
-        }
-        if (RT_SUCCESS(rc))
-        {
-(void **)
+
-            AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pApicReg->pszGetTPRR0, rc));
-        }
-        if (RT_SUCCESS(rc))
-        {
-(void **)
+
-            AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pApicReg->pszBusDeliverR0, rc));
-        }
@@ -2879 +2879 @@
-        &&  pIoApicReg->pszSetIrqR0)
-    {
-(void **)
+
-        AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pIoApicReg->pszSetIrqR0, rc));
-        if (VBOX_FAILURE(rc))
@@ -3783 +3783 @@
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC);
-    PCPDMPICHLPR0 pR0Helpers = 0;
-(void **)
+
-    AssertReleaseRC(rc);
-    AssertRelease(pR0Helpers);
@@ -3870 +3870 @@
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC);
-    PCPDMAPICHLPR0 pR0Helpers = 0;
-(void **)
+
-    AssertReleaseRC(rc);
-    AssertRelease(pR0Helpers);
@@ -3934 +3934 @@
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC);
-    PCPDMIOAPICHLPR0 pR0Helpers = 0;
-(void **)
+
-    AssertReleaseRC(rc);
-    AssertRelease(pR0Helpers);
@@ -4006 +4006 @@
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC);
-    PCPDMPCIHLPR0 pR0Helpers = 0;
-(void **)
+
-    AssertReleaseRC(rc);
-    AssertRelease(pR0Helpers);

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -646 +646 @@
- * @param   ppvValue        Where to store the symbol value.
- */
-void **
+PRTR0PTR 
-{
-#ifdef PDMLDR_FAKE_MODE
-(void *)
+
-    return VINF_SUCCESS;
-
@@ -668 +668 @@
-            &&  !strcmp(pModule->szName, pszModule))
-        {
-
+(void **)
-            if (VBOX_FAILURE(rc))
-            {
@@ -694 +694 @@
- * @param   ppvValue        Where to store the symbol value.
- */
-void **
+PRTR0PTR 
-{
-#ifdef PDMLDR_FAKE_MODE
-(void *)
+
-    return VINF_SUCCESS;
-

trunk/src/VBox/VMM/PGMBth.h

@@ -89 +89 @@
-
-        /* Ring 0 */
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_BTH_NAME_R0_STR(Trap0eHandler),  rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_BTH_NAME_R0_STR(InvalidatePage), rc), rc);
-        rc = PDMR3GetSymbolR0(pVM, NULL, PGM_BTH_NAME_R0_STR(SyncCR3), &pModeData->pfnR0BthSyncCR3);
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_BTH_NAME_R0_STR(SyncCR3), rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_BTH_NAME_R0_STR(SyncPage), rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_BTH_NAME_R0_STR(PrefetchPage), rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_BTH_NAME_R0_STR(VerifyAccessSyncPage), rc), rc);
-#ifdef VBOX_STRICT
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_BTH_NAME_R0_STR(AssertCR3), rc), rc);
-#endif

trunk/src/VBox/VMM/PGMGst.h

@@ -165 +165 @@
-
-        /* Ring-0 */
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_GST_NAME_R0_STR(GetPage),  rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_GST_NAME_R0_STR(ModifyPage),  rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_GST_NAME_R0_STR(GetPDE), rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_GST_NAME_R0_STR(MonitorCR3), rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_GST_NAME_R0_STR(UnmonitorCR3), rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_GST_NAME_R0_STR(MapCR3), rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_GST_NAME_R0_STR(UnmapCR3), rc), rc);
-#if PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_PAE
-# if 0/** @todo ring-0. */
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_GST_NAME_R0_STR(WriteHandlerCR3), rc), rc);
-# endif

trunk/src/VBox/VMM/PGMHandler.cpp

@@ -114 +114 @@
-    int rc = VINF_SUCCESS;
-    if (HWACCMR3IsAllowed(pVM))
-(void **)
+
-    if (VBOX_SUCCESS(rc))
-    {

trunk/src/VBox/VMM/PGMPool.cpp

@@ -377 +377 @@
-    if (!pVM->pgm.s.pPoolHC->pfnAccessHandlerR0)
-    {
-(void **)
+
-        AssertReleaseRC(rc);
-    }

trunk/src/VBox/VMM/PGMShw.h

@@ -132 +132 @@
-
-        /* Ring-0 */
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_SHW_NAME_R0_STR(GetPage),  rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_SHW_NAME_R0_STR(ModifyPage),  rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_SHW_NAME_R0_STR(GetPDEByIndex),  rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_SHW_NAME_R0_STR(SetPDEByIndex),  rc), rc);
-(void **)
+
-        AssertMsgRCReturn(rc, ("%s -> rc=%Vrc\n", PGM_SHW_NAME_R0_STR(ModifyPDEByIndex),  rc), rc);
-    }

trunk/src/VBox/VMM/VMM.cpp

@@ -870 +870 @@
-        if (!pR0Logger->fCreated)
-        {
-HCPTR pfnLoggerWrapper = NULL
+R0PTR pfnLoggerWrapper = NIL_RTR0PTR
-            rc = PDMR3GetSymbolR0(pVM, VMMR0_MAIN_MODULE_NAME, "vmmR0LoggerWrapper", &pfnLoggerWrapper);
-            AssertReleaseMsgRCReturn(rc, ("VMMLoggerWrapper not found! rc=%Vra\n", rc), rc);
-
-HCPTR pfnLoggerFlush = NULL
+R0PTR pfnLoggerFlush = NIL_RTR0PTR
-            rc = PDMR3GetSymbolR0(pVM, VMMR0_MAIN_MODULE_NAME, "vmmR0LoggerFlush", &pfnLoggerFlush);
-            AssertReleaseMsgRCReturn(rc, ("VMMLoggerFlush not found! rc=%Vra\n", rc), rc);