Changeset 82354 in vbox for trunk/src/VBox

Timestamp:

Dec 3, 2019 7:15:02 PM (5 years ago)

Author:

vboxsync

Message:

Dev/E1000: Fixed regression introduced by r135174

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (3 diffs)
• DevE1000Phy.cpp (modified) (2 diffs)

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

@@ -6015 +6015 @@
             return PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "unsupported op size: offset=%#10x cb=%#10x\n", offReg, cb);
     }
-    if (index > 0)
+    if (index >= 0)
     {
         RT_UNTRUSTED_VALIDATED_FENCE(); /* paranoia because of port I/O. */
@@ -6081 +6081 @@
     VBOXSTRICTRC rc     = VINF_SUCCESS;
     int          idxReg = e1kRegLookup(offReg);
-    if (RT_LIKELY(idxReg > 0))
+    if (RT_LIKELY(idxReg >= 0))
     {
         RT_UNTRUSTED_VALIDATED_FENCE(); /* paranoia because of port I/O. */
@@ -6129 +6129 @@
     VBOXSTRICTRC rc    = VINF_SUCCESS;
     int          index = e1kRegLookup(offReg);
-    if (RT_LIKELY(index > 0))
+    if (RT_LIKELY(index >= 0))
     {
         RT_UNTRUSTED_VALIDATED_FENCE(); /* paranoia because of port I/O. */

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

@@ -259 +259 @@
     uint16_t u16   = 0;
 
-    if (index > 0)
+    if (index >= 0)
     {
         u16 = s_regMap[index].pfnRead(pPhy, (uint32_t)index, pDevIns);
@@ -284 +284 @@
     int index = Phy::lookupRegister(u32Address);
 
-    if (index > 0)
+    if (index >= 0)
     {
         PhyLog(("PHY#%d At %02d write      %04X  to  %s (%s)\n",