Changeset 44852 in vbox for trunk/src/VBox/Devices/VirtIO

Timestamp:

Feb 27, 2013 8:27:33 PM (12 years ago)

Author:

vboxsync

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

84001

Message:

s/addrIOPort/IOPortBase/g

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• Virtio.cpp (modified) (6 diffs)
• Virtio.h (modified) (1 diff)

trunk/src/VBox/Devices/VirtIO/Virtio.cpp

@@ -323 +323 @@
     VPCISTATE  *pState = PDMINS_2_DATA(pDevIns, VPCISTATE *);
     int         rc     = VINF_SUCCESS;
-    const char *szInst = INSTANCE(pState);
     STAM_PROFILE_ADV_START(&pState->CTXSUFF(StatIORead), a);
 
@@ -342 +341 @@
         }*/
 
-    Port -= pState->addrIOPort;
+    Port -= pState->IOPortBase;
     switch (Port)
     {
@@ -388 +387 @@
                 *pu32 = 0xFFFFFFFF;
                 rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "%s vpciIOPortIn: no valid port at offset port=%RTiop cb=%08x\n",
-                                       szInst, Port, cb);
+                                       INSTANCE(pState), Port, cb);
             }
             break;
     }
-    Log3(("%s vpciIOPortIn:  At %RTiop in  %0*x\n", szInst, Port, cb*2, *pu32));
+    Log3(("%s vpciIOPortIn:  At %RTiop in  %0*x\n", INSTANCE(pState), Port, cb*2, *pu32));
     STAM_PROFILE_ADV_STOP(&pState->CTXSUFF(StatIORead), a);
     //vpciCsLeave(pState);
@@ -428 +427 @@
     VPCISTATE  *pState = PDMINS_2_DATA(pDevIns, VPCISTATE *);
     int         rc     = VINF_SUCCESS;
-    const char *szInst = INSTANCE(pState);
     bool        fHasBecomeReady;
     STAM_PROFILE_ADV_START(&pState->CTXSUFF(StatIOWrite), a);
 
-    Port -= pState->addrIOPort;
-    Log3(("%s virtioIOPortOut: At %RTiop out          %0*x\n", szInst, Port, cb*2, u32));
+    Port -= pState->IOPortBase;
+    Log3(("%s virtioIOPortOut: At %RTiop out          %0*x\n", INSTANCE(pState), Port, cb*2, u32));
 
     switch (Port)
@@ -479 +477 @@
                 pState->uQueueSelector = u32;
             else
-                Log3(("%s vpciIOPortOut: Invalid queue selector %08x\n", szInst, u32));
+                Log3(("%s vpciIOPortOut: Invalid queue selector %08x\n", INSTANCE(pState), u32));
             break;
 
@@ -523 +521 @@
             else
                 rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "%s vpciIOPortOut: no valid port at offset Port=%RTiop cb=%08x\n",
-                                       szInst, Port, cb);
+                                       INSTANCE(pState), Port, cb);
             break;
     }

trunk/src/VBox/Devices/VirtIO/Virtio.h

@@ -183 +183 @@
     PCIDEVICE              pciDevice;
     /** Base port of I/O space region. */
-    RTIOPORT               addrIOPort;
+    RTIOPORT               IOPortBase;
 
     /* Read/write part, protected with critical section. */