Changeset 50876 in vbox

Timestamp:

Mar 26, 2014 12:43:08 AM (11 years ago)

Author:

vboxsync

Message:

DevSerial.cpp: Added missing bits of state info to the saved state. Was causing windbg to be horribly slow when attaching after restoring a snapshot. (guest w8)

File:

• trunk/src/VBox/Devices/Serial/DevSerial.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Serial/DevSerial.cpp

@@ -68 +68 @@
 *******************************************************************************/
 #define SERIAL_SAVED_STATE_VERSION_16450        3
-#define SERIAL_SAVED_STATE_VERSION              4
+#define SERIAL_SAVED_STATE_VERSION_MISSING_BITS 4
+#define SERIAL_SAVED_STATE_VERSION              5
 
 #define UART_LCR_DLAB       0x80        /* Divisor latch access bit */
@@ -930 +931 @@
     SSMR3PutBool(pSSM, pThis->msr_changed);
 
+    /* Version 5, safe everything that might be of importance.  Much better than
+       missing relevant bits! */
+    SSMR3PutU8(pSSM, pThis->thr);
+    SSMR3PutU8(pSSM, pThis->tsr);
+    SSMR3PutU8(pSSM, pThis->iir);
+    SSMR3PutS32(pSSM, pThis->timeout_ipending);
+    TMR3TimerSave(pThis->fifo_timeout_timer, pSSM);
+    TMR3TimerSave(pThis->transmit_timerR3, pSSM);
+    SSMR3PutU8(pSSM, pThis->recv_fifo.itl);
+    SSMR3PutU8(pSSM, pThis->xmit_fifo.itl);
+
     /* Don't store:
      *  - the content of the FIFO
@@ -944 +956 @@
 static DECLCALLBACK(int) serialLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
-
-    if (uVersion == SERIAL_SAVED_STATE_VERSION_16450)
-    {
-        pThis->f16550AEnabled = false;
-        LogRel(("Serial#%d: falling back to 16450 mode from load state\n", pDevIns->iInstance));
+    PDEVSERIAL  pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    int32_t     iIrq;
+    uint32_t    IOBase;
+
+    AssertMsgReturn(uVersion >= SERIAL_SAVED_STATE_VERSION_16450, ("%d\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
+
+    if (uPass != SSM_PASS_FINAL)
+    {
+        SSMR3GetS32(pSSM, &iIrq);
+        int rc = SSMR3GetU32(pSSM, &IOBase);
+        AssertRCReturn(rc, rc);
     }
     else
-        AssertMsgReturn(uVersion == SERIAL_SAVED_STATE_VERSION, ("%d\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
-
-    if (uPass == SSM_PASS_FINAL)
-    {
+    {
+        if (uVersion == SERIAL_SAVED_STATE_VERSION_16450)
+        {
+            pThis->f16550AEnabled = false;
+            LogRel(("Serial#%d: falling back to 16450 mode from load state\n", pDevIns->iInstance));
+        }
+
         SSMR3GetU16(pSSM, &pThis->divider);
         SSMR3GetU8(pSSM, &pThis->rbr);
@@ -965 +985 @@
         SSMR3GetU8(pSSM, &pThis->scr);
         if (uVersion > SERIAL_SAVED_STATE_VERSION_16450)
+            SSMR3GetU8(pSSM, &pThis->fcr);
+        SSMR3GetS32(pSSM, &pThis->thr_ipending);
+        SSMR3GetS32(pSSM, &iIrq);
+        SSMR3GetS32(pSSM, &pThis->last_break_enable);
+        SSMR3GetU32(pSSM, &IOBase);
+        SSMR3GetBool(pSSM, &pThis->msr_changed);
+
+        if (uVersion > SERIAL_SAVED_STATE_VERSION_MISSING_BITS)
         {
-            SSMR3GetU8(pSSM, &pThis->fcr);
-        }
-        SSMR3GetS32(pSSM, &pThis->thr_ipending);
-    }
-
-    int32_t  iIrq;
-    SSMR3GetS32(pSSM, &iIrq);
-
-    if (uPass == SSM_PASS_FINAL)
-        SSMR3GetS32(pSSM, &pThis->last_break_enable);
-
-    uint32_t IOBase;
-    int rc = SSMR3GetU32(pSSM, &IOBase);
-    AssertRCReturn(rc, rc);
-
-    if (    pThis->irq  != iIrq
-        ||  pThis->base != IOBase)
-        return SSMR3SetCfgError(pSSM, RT_SRC_POS,
-                                N_("Config mismatch - saved irq=%#x iobase=%#x; configured irq=%#x iobase=%#x"),
-                                iIrq, IOBase, pThis->irq, pThis->base);
-
-    if (uPass == SSM_PASS_FINAL)
-    {
-        SSMR3GetBool(pSSM, &pThis->msr_changed);
-
+            SSMR3GetU8(pSSM, &pThis->thr);
+            SSMR3GetU8(pSSM, &pThis->tsr);
+            SSMR3GetU8(pSSM, &pThis->iir);
+            SSMR3GetS32(pSSM, &pThis->timeout_ipending);
+            TMR3TimerLoad(pThis->fifo_timeout_timer, pSSM);
+            TMR3TimerLoad(pThis->transmit_timerR3, pSSM);
+            SSMR3GetU8(pSSM, &pThis->recv_fifo.itl);
+            SSMR3GetU8(pSSM, &pThis->xmit_fifo.itl);
+        }
+
+        /* the marker. */
         uint32_t u32;
-        rc = SSMR3GetU32(pSSM, &u32);
+        int rc = SSMR3GetU32(pSSM, &u32);
         if (RT_FAILURE(rc))
             return rc;
@@ -1010 +1024 @@
         pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
     }
+
+    /*
+     * Check the config.
+     */
+    if (    pThis->irq  != iIrq
+        ||  pThis->base != IOBase)
+        return SSMR3SetCfgError(pSSM, RT_SRC_POS,
+                                N_("Config mismatch - saved irq=%#x iobase=%#x; configured irq=%#x iobase=%#x"),
+                                iIrq, IOBase, pThis->irq, pThis->base);
 
     return VINF_SUCCESS;