Changeset 66151 in vbox

Timestamp:

Mar 16, 2017 10:55:05 PM (8 years ago)

Author:

vboxsync

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

114057

Message:

DevPcBios.cpp: Fixed incorrect SSMR3GetStruct call (corrupted pThis on the stack, leaving pThis->fNewShutdownPort untouched). Style fixes. Untested.

File:

• trunk/src/VBox/Devices/PC/DevPcBios.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -344 +344 @@
 }
 
-/**
- * Execute state save operation.
- *
- * @returns VBox status code.
- * @param   pDevIns         Device instance which registered the data unit.
- * @param   pSSM            SSM operation handle.
+
+/**
+ * @callback_method_impl{FNSSMDEVSAVEXEC}
  */
 static DECLCALLBACK(int) pcbiosSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
@@ -360 +357 @@
 
 /**
- * Prepare state load operation.
- *
- * @returns VBox status code.
- * @param   pDevIns         Device instance which registered the data unit.
- * @param   pSSM            SSM operation handle.
+ * @callback_method_impl{FNSSMDEVLOADPREP,
+ *      Clears the fNewShutdownPort flag prior to loading the state, so that old
+ *      saved VM states keeps using the old port address (no pcbios state).}
  */
 static DECLCALLBACK(int) pcbiosLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
@@ -370 +365 @@
     RT_NOREF(pSSM);
     PDEVPCBIOS pThis = PDMINS_2_DATA(pDevIns, PDEVPCBIOS);
+
     /* Since there are legacy saved state files without any SSM data for PCBIOS
      * this is the only way to handle them correctly. */
@@ -377 +373 @@
 }
 
-/**
- * Execute state load operation.
- *
- * @returns VBox status code.
- * @param   pDevIns         Device instance which registered the data unit.
- * @param   pSSM            SSM operation handle.
- * @param   uVersion        Data layout version.
- * @param   uPass           The data pass.
+
+/**
+ * @callback_method_impl{FNSSMDEVLOADEXEC}
  */
 static DECLCALLBACK(int) pcbiosLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
@@ -394 +385 @@
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
-    SSMR3GetStruct(pSSM, &pThis, g_aPcBiosFields);
-
-    return VINF_SUCCESS;
-}
-
-/**
- * Finish state load operation.
- *
- * @returns VBox status code.
- * @param   pDevIns         Device instance which registered the data unit.
- * @param   pSSM            SSM operation handle.
+    return SSMR3GetStruct(pSSM, pThis, g_aPcBiosFields);
+}
+
+
+/**
+ * @callback_method_impl{FNSSMDEVLOADDONE,
+ *      Updates the shutdown port registration to match the flag loaded (or not).}
  */
 static DECLCALLBACK(int) pcbiosLoadDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
@@ -410 +397 @@
     RT_NOREF(pSSM);
     PDEVPCBIOS pThis = PDMINS_2_DATA(pDevIns, PDEVPCBIOS);
-
-    /* Update the shutdown port registration to match the flag. */
     return pcbiosRegisterShutdown(pDevIns, pThis, pThis->fNewShutdownPort);
 }