Changeset 91238 in vbox

Timestamp:

Sep 14, 2021 8:45:35 PM (3 years ago)

Author:

vboxsync

Message:

DevACPI: Use ASSERT_GUEST instead of Assert in a couple of place; fixed a PDMDevHlpDBGFStop.

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -25 +25 @@
 #include <VBox/vmm/dbgftrace.h>
 #include <VBox/vmm/vmcpuset.h>
+#include <VBox/AssertGuest.h>
 #include <VBox/log.h>
 #include <VBox/param.h>
@@ -1472 +1473 @@
         u32 >>= 2;
     }
-    Assert(u32 < BAT_INDEX_LAST);
+    ASSERT_GUEST_MSG(u32 < BAT_INDEX_LAST, ("%#x\n", u32));
     pThis->uBatteryIndex = u32;
 
@@ -1567 +1568 @@
             u32 >>= 2;
 
-        AssertMsg(u32 < SYSTEM_INFO_INDEX_END, ("%u - Max=%u. IndexShift=%u\n", u32, SYSTEM_INFO_INDEX_END, pThis->u8IndexShift));
+        ASSERT_GUEST_MSG(u32 < SYSTEM_INFO_INDEX_END, ("%u - Max=%u. IndexShift=%u\n", u32, SYSTEM_INFO_INDEX_END, pThis->u8IndexShift));
         pThis->uSystemInfoIndex = u32;
     }
@@ -1775 +1776 @@
         default:
             *pu32 = UINT32_MAX;
-            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "cb=%d offPort=%u idx=%u\n", cb, offPort, pThis->uBatteryIndex);
+            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "cb=%d offPort=%u idx=%u\n", cb, offPort, uSystemInfoIndex);
             break;
     }
@@ -3972 +3973 @@
     for (uint8_t i = 0; i < pThis->cCustTbls; i++)
     {
-        Assert(i < MAX_CUST_TABLES);
+        AssertBreak(i < MAX_CUST_TABLES);
         acpiR3PhysCopy(pDevIns, aGCPhysCust[i] + addend, pThisCC->apu8CustBin[i], pThisCC->acbCustBin[i]);
         aGCPhysRsdt[iCust + i] = aGCPhysCust[i] + addend;
@@ -4687 +4688 @@
 
             pThis->cCustTbls++;
-            Assert(pThis->cCustTbls <= MAX_CUST_TABLES);
+            AssertBreak(pThis->cCustTbls <= MAX_CUST_TABLES);
         }
     }