Changeset 24038 in vbox for trunk

Timestamp:

Oct 23, 2009 2:17:37 PM (15 years ago)

Author:

vboxsync

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

53893

Message:

DevEEPROM.cpp: it's sufficient to return the status of the last SSM operation in EEPROM93C46::load() - SSM remembers errors.

File:

• trunk/src/VBox/Devices/Network/DevEEPROM.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevEEPROM.cpp

@@ -259 +259 @@
 int EEPROM93C46::load(PSSMHANDLE pSSM)
 {
-    int rc = VINF_SUCCESS;
-    uint8_t uVersion = 0;
+    int rc;
+    uint8_t uVersion;
 
     rc = SSMR3GetU8(pSSM, &uVersion);
@@ -267 +267 @@
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
 
-    rc = SSMR3GetU8(  pSSM, (uint8_t*)&m_eState);
-    AssertRCReturn(rc, rc);
-    rc = SSMR3GetU8(  pSSM, (uint8_t*)&m_eOp);
-    AssertRCReturn(rc, rc);
-    rc = SSMR3GetBool(pSSM, &m_fWriteEnabled);
-    AssertRCReturn(rc, rc);
-    rc = SSMR3GetU32( pSSM, &m_u32InternalWires);
-    AssertRCReturn(rc, rc);
-    rc = SSMR3GetU16( pSSM, &m_u16Word);
-    AssertRCReturn(rc, rc);
-    rc = SSMR3GetU16( pSSM, &m_u16Mask);
-    AssertRCReturn(rc, rc);
-    rc = SSMR3GetU16( pSSM, &m_u16Addr);
-    AssertRCReturn(rc, rc);
-    rc = SSMR3GetMem( pSSM, m_au16Data, sizeof(m_au16Data));
-
-    return rc;
-}
+    SSMR3GetU8(  pSSM, (uint8_t*)&m_eState);
+    SSMR3GetU8(  pSSM, (uint8_t*)&m_eOp);
+    SSMR3GetBool(pSSM, &m_fWriteEnabled);
+    SSMR3GetU32( pSSM, &m_u32InternalWires);
+    SSMR3GetU16( pSSM, &m_u16Word);
+    SSMR3GetU16( pSSM, &m_u16Mask);
+    SSMR3GetU16( pSSM, &m_u16Addr);
+    return SSMR3GetMem( pSSM, m_au16Data, sizeof(m_au16Data));
+}