Changeset 7523 in vbox

Timestamp:

Mar 25, 2008 9:52:30 AM (17 years ago)

Author:

vboxsync

Message:

Unconditionally resolve R0 function addresses

Location:

trunk/src/VBox/VMM

Files:

• PDMDevice.cpp (modified) (7 diffs)
• PGMHandler.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -31 +31 @@
 #include <VBox/vm.h>
 #include <VBox/vmm.h>
-#include <VBox/hwaccm.h>
 
 #include <VBox/version.h>
@@ -1276 +1275 @@
              Port, cPorts, pvUser, pszOut, pszOut, pszIn, pszIn, pszOutStr, pszOutStr, pszInStr, pszInStr, pszDesc, pszDesc));
 
-    if (!HWACCMR3IsAllowed(pDevIns->Internal.s.pVMHC))
-        return VINF_SUCCESS; /* NOP */
-
     /*
      * Resolve the functions (one of the can be NULL).
@@ -1418 +1414 @@
     LogFlow(("pdmR3DevHlp_MMIORegisterHC: caller='%s'/%d: GCPhysStart=%VGp cbRange=%#x pvUser=%p pszWrite=%p:{%s} pszRead=%p:{%s} pszFill=%p:{%s} pszDesc=%p:{%s}\n",
              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pszWrite, pszWrite, pszRead, pszRead, pszFill, pszFill, pszDesc, pszDesc));
-
-    if (!HWACCMR3IsAllowed(pDevIns->Internal.s.pVMHC))
-        return VINF_SUCCESS; /* NOP */
 
     /*
@@ -2534 +2527 @@
      * Resolve and init the R0 bits.
      */
-    if (    HWACCMR3IsAllowed(pVM)
-        &&  pPciBusReg->pszSetIrqR0)
+    if (pPciBusReg->pszSetIrqR0)
     {
         int rc = PDMR3GetSymbolR0Lazy(pVM, pDevIns->pDevReg->szR0Mod, pPciBusReg->pszSetIrqR0, &pPciBus->pfnSetIrqR0);
@@ -2672 +2664 @@
      * R0 stuff.
      */
-    if (    HWACCMR3IsAllowed(pVM)
-        &&  pPicReg->pszSetIrqR0)
+    if (pPicReg->pszSetIrqR0)
     {
         int rc = PDMR3GetSymbolR0Lazy(pVM, pDevIns->pDevReg->szR0Mod, pPicReg->pszSetIrqR0, &pVM->pdm.s.Pic.pfnSetIrqR0);
@@ -2868 +2859 @@
      * Resolve & initialize the R0 bits.
      */
-    if (    HWACCMR3IsAllowed(pVM)
-        &&  pApicReg->pszGetInterruptR0)
+    if (pApicReg->pszGetInterruptR0)
     {
         int rc = PDMR3GetSymbolR0Lazy(pVM, pDevIns->pDevReg->szR0Mod, pApicReg->pszGetInterruptR0, &pVM->pdm.s.Apic.pfnGetInterruptR0);
@@ -3033 +3023 @@
      * Resolve & initialize the R0 bits.
      */
-    if (    HWACCMR3IsAllowed(pVM)
-        &&  pIoApicReg->pszSetIrqR0)
+    if (pIoApicReg->pszSetIrqR0)
     {
         int rc = PDMR3GetSymbolR0Lazy(pVM, pDevIns->pDevReg->szR0Mod, pIoApicReg->pszSetIrqR0, &pVM->pdm.s.IoApic.pfnSetIrqR0);

trunk/src/VBox/VMM/PGMHandler.cpp

@@ -101 +101 @@
     R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0 = NIL_RTR0PTR;
     int rc = VINF_SUCCESS;
-    if (pszHandlerR0 && HWACCMR3IsAllowed(pVM))
+    if (pszHandlerR0)
         rc = PDMR3GetSymbolR0Lazy(pVM, pszModR0, pszHandlerR0, &pfnHandlerR0);
     if (VBOX_SUCCESS(rc))