Changeset 92940 in vbox for trunk

Timestamp:

Dec 15, 2021 4:07:43 PM (3 years ago)

Author:

vboxsync

Message:

Attempt 1 burn fix. virtioCoreFormatDeviceStatus() saying undefined. Trying to wrap in #ifdef LOG_ENABLED, and hope that's the issue

File:

• trunk/src/VBox/Devices/VirtIO/VirtioCore.cpp (modified) (10 diffs)

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

@@ -517 +517 @@
     memset(pszBuf, 0, uSize);
     char *cp = pszBuf, *sep = (char *)"";
-    int len;
+    size_t len;
     if (bStatus == 0)
         RTStrPrintf(cp, uSize, "RESET");
@@ -1435 +1435 @@
             pVirtio->fDeviceStatus = *(uint8_t *)pv;
             bool fDeviceReset = pVirtio->fDeviceStatus == 0;
-
+#ifdef LOG_ENABLED
             if (LogIs7Enabled())
             {
@@ -1442 +1442 @@
                 Log(("%-23s: Guest wrote fDeviceStatus ................ (%s)\n", __FUNCTION__, szOut));
             }
+#endif
             bool const fStatusChanged = IS_DRIVER_OK(pVirtio) != WAS_DRIVER_OK(pVirtio);
 
@@ -1472 +1473 @@
         {
             *(uint8_t *)pv = pVirtio->fDeviceStatus;
-
+#ifdef LOG_ENABLED
             if (LogIs7Enabled())
             {
@@ -1479 +1480 @@
                 LogFunc(("Guest read  fDeviceStatus ................ (%s)\n", szOut));
             }
+#endif
         }
     }
@@ -1567 +1569 @@
     {
         *(uint8_t *)pu32 = pVirtio->fDeviceStatus;
+#ifdef LOG_ENABLED
         if (LogIs7Enabled())
         {
@@ -1573 +1576 @@
             Log(("%-23s: Guest read  fDeviceStatus ................ (%s)\n", __FUNCTION__, szOut));
         }
+#endif
     }
     else
@@ -1704 +1708 @@
         bool const fDriverInitiatedReset = (pVirtio->fDeviceStatus = (uint8_t)u32) == 0;
         bool const fDriverStateImproved = IS_DRIVER_OK(pVirtio) && !WAS_DRIVER_OK(pVirtio);
-
+#ifdef LOG_ENABLED
         if (LogIs7Enabled())
         {
@@ -1711 +1715 @@
             Log(("%-23s: Guest wrote fDeviceStatus ................ (%s)\n", __FUNCTION__, szOut));
         }
+#endif
         if (fDriverStateImproved  || fDriverInitiatedReset)
         {
@@ -2063 +2068 @@
 
     char szOut[80] = { 0 };
+#ifdef LOG_ENABLED
     virtioCoreFormatDeviceStatus(pVirtio->fDeviceStatus, szOut, sizeof(szOut));
+#endif
     Log(("Loaded legacy device status = (%s)\n", szOut));