Changeset 81509 in vbox for trunk/src/VBox/Devices/EFI

Timestamp:

Oct 24, 2019 8:56:40 AM (5 years ago)

Author:

vboxsync

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

134237

Message:

DevEFI,DevFlash: Always save the content to the NVRAM/flash file. bugref:6940

Location:

trunk/src/VBox/Devices/EFI

Files:

• DevEFI.cpp (modified) (2 diffs)
• DevFlash.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -262 +262 @@
     /** Filename of the file containing the NVRAM store. */
     char                    *pszNvramFile;
-    /** Flag whether the NVRAM state was saved using SSM. */
-    bool                    fNvramStateSaved;
 
     /**
@@ -1979 +1977 @@
     nvramFlushDeviceVariableList(pThisCC);
 
-    if (   !pThisCC->fNvramStateSaved
-        && pThisCC->pszNvramFile)
+    if (pThisCC->pszNvramFile)
     {
         int rc = flashR3SaveToFile(&pThis->Flash, pDevIns, pThisCC->pszNvramFile);
         if (RT_FAILURE(rc))
-            LogRel(("EFI: Failed to save flash file to '%s' -> %Rrc\n", pThisCC->pszNvramFile, rc));
+            LogRel(("EFI: Failed to save flash file to '%s': %Rrc\n", pThisCC->pszNvramFile, rc));
     }
 

trunk/src/VBox/Devices/EFI/DevFlash.cpp

@@ -38 +38 @@
 
 
-/*********************************************************************************************************************************
-*   Defined Constants And Macros                                                                                                 *
-*********************************************************************************************************************************/
-
 
 /*********************************************************************************************************************************
@@ -55 +51 @@
     /** The guest physical memory base address. */
     RTGCPHYS            GCPhysFlashBase;
-    /** When set, indicates the state was saved. */
-    bool                fStateSaved;
     /** The file conaining the flash content. */
     char                *pszFlashFile;
 } DEVFLASH;
-
 /** Pointer to the Flash device state. */
 typedef DEVFLASH *PDEVFLASH;
@@ -96 +89 @@
 {
     PDEVFLASH pThis = PDMINS_2_DATA(pDevIns, PDEVFLASH);
-
-    int rc = flashR3SaveExec(&pThis->Core, pDevIns, pSSM);
-    if (RT_SUCCESS(rc))
-        pThis->fStateSaved = true;
-
-    return rc;
+    return flashR3SaveExec(&pThis->Core, pDevIns, pSSM);
 }
 
@@ -133 +121 @@
 static DECLCALLBACK(int) flashDestruct(PPDMDEVINS pDevIns)
 {
-    PDEVFLASH pThis = PDMINS_2_DATA(pDevIns, PDEVFLASH);
-    int rc;
-
-    if (!pThis->fStateSaved)
-    {
-        rc = flashR3SaveToFile(&pThis->Core, pDevIns, pThis->pszFlashFile);
-        if (RT_FAILURE(rc))
-            LogRel(("Flash: Failed to save flash file"));
-    }
+    PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
+    PDEVFLASH pThis = PDMINS_2_DATA(pDevIns, PDEVFLASH);
+
+    int rc = flashR3SaveToFile(&pThis->Core, pDevIns, pThis->pszFlashFile);
+    if (RT_FAILURE(rc))
+        LogRel(("Flash: Failed to save flash file: %Rrc\n", rc));
 
     if (pThis->pszFlashFile)
@@ -158 +143 @@
 static DECLCALLBACK(int) flashConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     RT_NOREF1(iInstance);
-    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     PDEVFLASH pThis = PDMINS_2_DATA(pDevIns, PDEVFLASH);
     Assert(iInstance == 0);