Changeset 25008 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 26, 2009 2:49:44 PM (15 years ago)

Author:

vboxsync

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

55319

Message:

PDM.cpp: SSMR3GetUInt/SSMR3PutUInt -> U32. Fixed shadowed variable warning.

File:

• trunk/src/VBox/VMM/PDM.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/PDM.cpp

@@ -680 +680 @@
     {
         PVMCPU pVCpu = &pVM->aCpus[idCpu];
-        SSMR3PutUInt(pSSM, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_APIC));
-        SSMR3PutUInt(pSSM, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_PIC));
-        SSMR3PutUInt(pSSM, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_NMI));
-        SSMR3PutUInt(pSSM, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_SMI));
-    }
-    SSMR3PutUInt(pSSM, VM_FF_ISSET(pVM, VM_FF_PDM_DMA));
+        SSMR3PutU32(pSSM, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_APIC));
+        SSMR3PutU32(pSSM, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_PIC));
+        SSMR3PutU32(pSSM, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_NMI));
+        SSMR3PutU32(pSSM, VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INTERRUPT_SMI));
+    }
+    SSMR3PutU32(pSSM, VM_FF_ISSET(pVM, VM_FF_PDM_DMA));
 
     pdmR3SaveBoth(pVM, pSSM);
@@ -773 +773 @@
 
             /* APIC interrupt */
-            RTUINT fInterruptPending = 0;
-            rc = SSMR3GetUInt(pSSM, &fInterruptPending);
+            uint32_t fInterruptPending = 0;
+            rc = SSMR3GetU32(pSSM, &fInterruptPending);
             if (RT_FAILURE(rc))
                 return rc;
@@ -788 +788 @@
             /* PIC interrupt */
             fInterruptPending = 0;
-            rc = SSMR3GetUInt(pSSM, &fInterruptPending);
+            rc = SSMR3GetU32(pSSM, &fInterruptPending);
             if (RT_FAILURE(rc))
                 return rc;
@@ -803 +803 @@
             {
                 /* NMI interrupt */
-                RTUINT fInterruptPending = 0;
-                rc = SSMR3GetUInt(pSSM, &fInterruptPending);
+                fInterruptPending = 0;
+                rc = SSMR3GetU32(pSSM, &fInterruptPending);
                 if (RT_FAILURE(rc))
                     return rc;
@@ -818 +818 @@
                 /* SMI interrupt */
                 fInterruptPending = 0;
-                rc = SSMR3GetUInt(pSSM, &fInterruptPending);
+                rc = SSMR3GetU32(pSSM, &fInterruptPending);
                 if (RT_FAILURE(rc))
                     return rc;
@@ -833 +833 @@
 
         /* DMA pending */
-        RTUINT fDMAPending = 0;
-        rc = SSMR3GetUInt(pSSM, &fDMAPending);
+        uint32_t fDMAPending = 0;
+        rc = SSMR3GetU32(pSSM, &fDMAPending);
         if (RT_FAILURE(rc))
             return rc;
@@ -857 +857 @@
         /* Get the sequence number / terminator. */
         uint32_t    u32Sep;
-        int rc = SSMR3GetU32(pSSM, &u32Sep);
+        rc = SSMR3GetU32(pSSM, &u32Sep);
         if (RT_FAILURE(rc))
             return rc;
@@ -870 +870 @@
         if (RT_FAILURE(rc))
             return rc;
-        RTUINT iInstance;
-        rc = SSMR3GetUInt(pSSM, &iInstance);
+        uint32_t iInstance;
+        rc = SSMR3GetU32(pSSM, &iInstance);
         if (RT_FAILURE(rc))
             return rc;