儲存庫 vbox 的更動 62425

時間撮記:

2016-7-22 上午11:28:52 (8 年 以前)

作者:

vboxsync

訊息:

Devices/RC: MSC level 4 warnings.

位置:

trunk/src/VBox/Devices

檔案:

• Graphics/DevVGA-SVGA.cpp (修改) (4 筆差異)
• Graphics/DevVGA.cpp (修改) (3 筆差異)
• Network/DevE1000.cpp (修改) (1 筆差異)
• Network/DevPCNet.cpp (修改) (1 筆差異)
• VMMDev/VMMDevTesting.cpp (修改) (1 筆差異)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -849 +849 @@
             rc = VINF_IOM_R3_IOPORT_READ;
             break;
-#elif defined(VMSVGA_USE_EMT_HALT_CODE)
+#else
+# if defined(VMSVGA_USE_EMT_HALT_CODE)
             /* The guest is basically doing a HLT via the device here, but with
                a special wake up condition on FIFO completion. */
@@ -862 +863 @@
             ASMAtomicDecU32(&pSVGAState->cBusyDelayedEmts);
             VMCPUSET_ATOMIC_DEL(&pSVGAState->BusyDelayedEmts, idCpu);
-#else
+# else
 
             /* Delay the EMT a bit so the FIFO and others can get some work done.
@@ -891 +892 @@
             }
             STAM_REL_PROFILE_STOP(&pSVGAState->StatBusyDelayEmts, EmtDelay);
+# endif
+            *pu32 = pThis->svga.fBusy != 0;
 #endif
-            *pu32 = pThis->svga.fBusy != 0;
         }
         else
@@ -1490 +1492 @@
     {
         Log(("Ignoring non-dword read at %x cb=%d\n", Port, cb));
-        *pu32 = ~0;
+        *pu32 = UINT32_MAX;
         return VINF_SUCCESS;
     }

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -364 +364 @@
 }
 
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4310 4245) /* Buggy warnings: cast truncates constant value; conversion from 'int' to 'const uint8_t', signed/unsigned mismatch */
+#endif
+
 /* force some bits to zero */
 static const uint8_t sr_mask[8] = {
@@ -394 +399 @@
     (uint8_t)~0xff, /* 0x0f */
 };
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
 
 #define cbswap_32(__x) \
@@ -3621 +3630 @@
 {
     static int lastWasNotNewline = 0;  /* We are only called in a single-threaded way */
-    PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
     NOREF(pvUser);
     Assert(PDMCritSectIsOwner(pDevIns->CTX_SUFF(pCritSectRo)));

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

@@ -4721 +4721 @@
 {
     int rc = VINF_SUCCESS;
-    uint32_t cbVTag = 0;
 
     e1kPrintTDesc(pThis, pDesc, "vvv");

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

@@ -1859 +1859 @@
                 if (fAddFCS)
                 {
-                    uint32_t fcs = ~0;
+                    uint32_t fcs = UINT32_MAX;
                     uint8_t *p = src;
 

trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp

@@ -144 +144 @@
                     break;
                 case 2:
-                    *(uint16_t *)pv = (uint16_t)VMMDEV_TESTING_NOP_RET;
+                    *(uint16_t *)pv = RT_LO_U16(VMMDEV_TESTING_NOP_RET);
                     break;
                 case 1:
-                    *(uint8_t *)pv  = (uint8_t)VMMDEV_TESTING_NOP_RET;
+                    *(uint8_t *)pv  = RT_LO_U8(VMMDEV_TESTING_NOP_RET);
                     break;
                 default: