Changeset 81454 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 22, 2019 4:04:00 PM (5 years ago)

Author:

vboxsync

Message:

VMM: Added PGMPHYS_ROM_FLAGS_MAYBE_MISSING_FROM_STATE to PGMR3PhysRomRegister. Needed for EFI restore hack. bugref:6940

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PGM.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (2 diffs)
• PGMSavedState.cpp (modified) (1 diff)

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

@@ -2276 +2276 @@
                     pHlp->pfnPrintf(pHlp, "    %RGp-%RGp %-20s %s\n",
                                     pCur->GCPhys + iFirstPage * X86_PAGE_SIZE,
-                                    pCur->GCPhys + iPage      * X86_PAGE_SIZE,
+                                    pCur->GCPhys + iPage      * X86_PAGE_SIZE - 1,
                                     pszType, pszMore);
                 else
                     pHlp->pfnPrintf(pHlp, "    %RGp-%RGp %s\n",
                                     pCur->GCPhys + iFirstPage * X86_PAGE_SIZE,
-                                    pCur->GCPhys + iPage      * X86_PAGE_SIZE,
+                                    pCur->GCPhys + iPage      * X86_PAGE_SIZE - 1,
                                     pszType);
 

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

@@ -4059 +4059 @@
     AssertPtrReturn(pvBinary, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pszDesc, VERR_INVALID_POINTER);
-    AssertReturn(!(fFlags & ~(PGMPHYS_ROM_FLAGS_SHADOWED | PGMPHYS_ROM_FLAGS_PERMANENT_BINARY)), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~PGMPHYS_ROM_FLAGS_VALID_MASK), VERR_INVALID_PARAMETER);
     VM_ASSERT_STATE_RETURN(pVM, VMSTATE_CREATING, VERR_VM_INVALID_VM_STATE);
 
@@ -4375 +4375 @@
  * @param   cbBinary            The size of the binary data pvBinary points to.
  *                              This must be less or equal to @a cb.
- * @param   fFlags              Mask of flags. PGMPHYS_ROM_FLAGS_SHADOWED
- *                              and/or PGMPHYS_ROM_FLAGS_PERMANENT_BINARY.
+ * @param   fFlags              Mask of flags, PGMPHYS_ROM_FLAGS_XXX.
  * @param   pszDesc             Pointer to description string. This must not be freed.
  *

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

@@ -332 +332 @@
         {
             for (PPGMROMRANGE pRom = pVM->pgm.s.pRomRangesR3; pRom; pRom = pRom->pNextR3)
-                AssertLogRelMsg(pRom->idSavedState != UINT8_MAX,
-                                ("The \"%s\" ROM was not found in the saved state. Probably due to some misconfiguration\n",
-                                 pRom->pszDesc));
+                if (pRom->idSavedState != UINT8_MAX)
+                { /* likely */ }
+                else if (pRom->fFlags & PGMPHYS_ROM_FLAGS_MAYBE_MISSING_FROM_STATE)
+                    LogRel(("PGM: The '%s' ROM was not found in the saved state, but it is marked as maybe-missing, so that's probably okay.\n",
+                            pRom->pszDesc));
+                else
+                    AssertLogRelMsg(pRom->idSavedState != UINT8_MAX,
+                                    ("The '%s' ROM was not found in the saved state. Probably due to some misconfiguration\n",
+                                     pRom->pszDesc));
             return VINF_SUCCESS;        /* the end */
         }