Changeset 75134 in vbox for trunk/src/VBox/Devices/Serial

Timestamp:

Oct 28, 2018 7:14:47 PM (6 years ago)

Author:

vboxsync

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

126211

Message:

DevSerial,UartCore: Attempt and getting old states to load. Needs proper testing that includes live saved states/migration.

Location:

trunk/src/VBox/Devices/Serial

Files:

• DevSerial.cpp (modified) (2 diffs)
• UartCore.cpp (modified) (5 diffs)

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

@@ -184 +184 @@
 {
     PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
-    uint8_t    uIrq;
+    uint8_t    bIrq;
     RTIOPORT   PortBase;
     UARTTYPE   enmType;
+    int rc;
 
     AssertMsgReturn(uVersion >= UART_SAVED_STATE_VERSION_16450, ("%d\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
-
-    if (uPass != SSM_PASS_FINAL)
-    {
-        SSMR3GetU8(pSSM, &uIrq);
+    if (uVersion > UART_SAVED_STATE_VERSION_LEGACY_CODE)
+    {
+        SSMR3GetU8(    pSSM, &bIrq);
         SSMR3GetIOPort(pSSM, &PortBase);
-        int rc = SSMR3GetU32(pSSM, (uint32_t *)&enmType);
+        rc = SSMR3GetU32(   pSSM, (uint32_t *)&enmType);
         AssertRCReturn(rc, rc);
+        if (uPass == SSM_PASS_FINAL)
+        {
+            rc = uartR3LoadExec(&pThis->UartCore, pSSM, uVersion, uPass, NULL, NULL);
+            AssertRCReturn(rc, rc);
+        }
     }
     else
     {
-        int rc = VINF_SUCCESS;
-
-        if (uVersion > UART_SAVED_STATE_VERSION_LEGACY_CODE)
+        enmType = uVersion > UART_SAVED_STATE_VERSION_16450 ? UARTTYPE_16550A : UARTTYPE_16450;
+        if (uPass != SSM_PASS_FINAL)
         {
-            SSMR3GetU8(    pSSM, &uIrq);
-            SSMR3GetIOPort(pSSM, &PortBase);
-            SSMR3GetU32(   pSSM, (uint32_t *)&enmType);
-            rc = uartR3LoadExec(&pThis->UartCore, pSSM, uVersion, uPass, NULL, NULL);
+            int32_t iIrqTmp;
+            SSMR3GetS32(pSSM, &iIrqTmp);
+            uint32_t uPortBaseTmp;
+            rc = SSMR3GetU32(pSSM, &uPortBaseTmp);
+            AssertRCReturn(rc, rc);
+
+            bIrq     = (uint8_t)iIrqTmp;
+            PortBase = (uint32_t)uPortBaseTmp;
         }
         else
         {
-            if (uVersion > UART_SAVED_STATE_VERSION_16450)
-                enmType = UARTTYPE_16550A;
-            else
-                enmType = UARTTYPE_16450;
-            rc = uartR3LoadExec(&pThis->UartCore, pSSM, uVersion, uPass, &uIrq, &PortBase);
+            rc = uartR3LoadExec(&pThis->UartCore, pSSM, uVersion, uPass, &bIrq, &PortBase);
+            AssertRCReturn(rc, rc);
         }
-        if (RT_SUCCESS(rc))
-        {
-            /* The marker. */
-            uint32_t u32;
-            rc = SSMR3GetU32(pSSM, &u32);
-            if (RT_FAILURE(rc))
-                return rc;
-            AssertMsgReturn(u32 == UINT32_MAX, ("%#x\n", u32), VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
-        }
+    }
+
+    if (uPass == SSM_PASS_FINAL)
+    {
+        /* The marker. */
+        uint32_t u32;
+        rc = SSMR3GetU32(pSSM, &u32);
+        AssertRCReturn(rc, rc);
+        AssertMsgReturn(u32 == UINT32_MAX, ("%#x\n", u32), VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
     }
 
@@ -230 +235 @@
      * Check the config.
      */
-    if (    pThis->uIrq     != uIrq
+    if (    pThis->uIrq     != bIrq
         ||  pThis->PortBase != PortBase
         ||  pThis->UartCore.enmType != enmType)
         return SSMR3SetCfgError(pSSM, RT_SRC_POS,
                                 N_("Config mismatch - saved IRQ=%#x PortBase=%#x Type=%d; configured IRQ=%#x PortBase=%#x Type=%d"),
-                                uIrq, PortBase, enmType, pThis->uIrq, pThis->PortBase, pThis->UartCore.enmType);
+                                bIrq, PortBase, enmType, pThis->uIrq, pThis->PortBase, pThis->UartCore.enmType);
 
     return VINF_SUCCESS;

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

@@ -1582 +1582 @@
 
 DECLHIDDEN(int) uartR3LoadExec(PUARTCORE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass,
-                               uint8_t *puIrq, RTIOPORT *pPortBase)
+                               uint8_t *pbIrq, RTIOPORT *pPortBase)
 {
     RT_NOREF(uPass);
-    int rc = VINF_SUCCESS;
+    int rc;
 
     if (uVersion > UART_SAVED_STATE_VERSION_LEGACY_CODE)
@@ -1607 +1607 @@
         SSMR3GetU8(pSSM,   &pThis->FifoRecv.cbItl);
 
-        TMR3TimerLoad(pThis->pTimerRcvFifoTimeoutR3, pSSM);
+        rc = TMR3TimerLoad(pThis->pTimerRcvFifoTimeoutR3, pSSM);
         if (uVersion > UART_SAVED_STATE_VERSION_PRE_UNCONNECTED_TX_TIMER)
-            TMR3TimerLoad(pThis->pTimerTxUnconnectedR3, pSSM);
+            rc = TMR3TimerLoad(pThis->pTimerTxUnconnectedR3, pSSM);
     }
     else
     {
+        AssertPtr(pbIrq);
+        AssertPtr(pPortBase);
         if (uVersion == UART_SAVED_STATE_VERSION_16450)
         {
@@ -1618 +1620 @@
             LogRel(("Serial#%d: falling back to 16450 mode from load state\n", pThis->pDevInsR3->iInstance));
         }
-
-        int      uIrq;
-        int32_t  iTmp;
-        uint32_t PortBase;
 
         SSMR3GetU16(pSSM, &pThis->uRegDivisor);
@@ -1633 +1631 @@
         if (uVersion > UART_SAVED_STATE_VERSION_16450)
             SSMR3GetU8(pSSM, &pThis->uRegFcr);
+
+        int32_t iTmp = 0;
         SSMR3GetS32(pSSM, &iTmp);
         pThis->fThreEmptyPending = RT_BOOL(iTmp);
-        SSMR3GetS32(pSSM, &uIrq);
-        SSMR3Skip(pSSM, sizeof(int32_t));
-        SSMR3GetU32(pSSM, &PortBase);
-        rc = SSMR3Skip(pSSM, sizeof(int32_t));
-
+
+        rc = SSMR3GetS32(pSSM, &iTmp);
+        AssertRCReturn(rc, rc);
+        *pbIrq = (uint8_t)iTmp;
+
+        SSMR3Skip(pSSM, sizeof(int32_t)); /* was: last_break_enable */
+
+        uint32_t uPortBaseTmp = 0;
+        rc = SSMR3GetU32(pSSM, &uPortBaseTmp);
+        AssertRCReturn(rc, rc);
+        *pPortBase = (RTIOPORT)uPortBaseTmp;
+
+        rc = SSMR3Skip(pSSM, sizeof(bool)); /* was: msr_changed */
         if (   RT_SUCCESS(rc)
             && uVersion > UART_SAVED_STATE_VERSION_MISSING_BITS)
@@ -1647 +1655 @@
             SSMR3GetU8(pSSM, &pThis->uRegIir);
 
-            int iTimeoutPending = 0;
+            int32_t iTimeoutPending = 0;
             SSMR3GetS32(pSSM, &iTimeoutPending);
             pThis->fIrqCtiPending = RT_BOOL(iTimeoutPending);
 
-            TMR3TimerLoad(pThis->pTimerRcvFifoTimeoutR3, pSSM);
-            TMR3TimerSkip(pSSM, NULL);
+            rc = TMR3TimerLoad(pThis->pTimerRcvFifoTimeoutR3, pSSM);
+            AssertRCReturn(rc, rc);
+
+            bool fWasActiveIgn;
+            rc = TMR3TimerSkip(pSSM, &fWasActiveIgn);  /* was: transmit_timerR3 */
+            AssertRCReturn(rc, rc);
+
             SSMR3GetU8(pSSM, &pThis->FifoRecv.cbItl);
             rc = SSMR3GetU8(pSSM, &pThis->FifoRecv.cbItl);
-        }
-
-        if (RT_SUCCESS(rc))
-        {
-            AssertPtr(puIrq);
-            AssertPtr(pPortBase);
-            *puIrq     = (uint8_t)uIrq;
-            *pPortBase = (RTIOPORT)PortBase;
         }
     }