Changeset 81436 in vbox for trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

Timestamp:

Oct 22, 2019 7:27:02 AM (5 years ago)

Author:

vboxsync

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

134154

Message:

PGMPhys: A REM removal cleanup. bugref:9576

File:

• trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (modified) (1 diff)

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

@@ -4236 +4236 @@
             rc = NEMR3NotifyPhysRomRegisterEarly(pVM, GCPhys, cb, fNemNotify);
 
-            /*
-             * !HACK ALERT!  REM + (Shadowed) ROM ==> mess.
-             *
-             * If it's shadowed we'll register the handler after the ROM notification
-             * so we get the access handler callbacks that we should. If it isn't
-             * shadowed we'll do it the other way around to make REM use the built-in
-             * ROM behavior and not the handler behavior (which is to route all access
-             * to PGM atm).
-             */
-            if (fFlags & PGMPHYS_ROM_FLAGS_SHADOWED)
-            {
-                if (RT_SUCCESS(rc))
-                    rc = PGMHandlerPhysicalRegister(pVM, GCPhys, GCPhysLast, pVM->pgm.s.hRomPhysHandlerType,
-                                                    pRomNew, MMHyperCCToR0(pVM, pRomNew), MMHyperCCToRC(pVM, pRomNew),
-                                                    pszDesc);
-            }
-            else
-            {
-                if (RT_SUCCESS(rc))
-                    rc = PGMHandlerPhysicalRegister(pVM, GCPhys, GCPhysLast, pVM->pgm.s.hRomPhysHandlerType,
-                                                    pRomNew, MMHyperCCToR0(pVM, pRomNew), MMHyperCCToRC(pVM, pRomNew),
-                                                    pszDesc);
-            }
+            /* Register the ROM access handler. */
+            if (RT_SUCCESS(rc))
+                rc = PGMHandlerPhysicalRegister(pVM, GCPhys, GCPhysLast, pVM->pgm.s.hRomPhysHandlerType,
+                                                pRomNew, MMHyperCCToR0(pVM, pRomNew), MMHyperCCToRC(pVM, pRomNew),
+                                                pszDesc);
             if (RT_SUCCESS(rc))
             {