Changeset 84823 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 15, 2020 6:58:36 AM (5 years ago)

Author:

vboxsync

Message:

VMM/DBGFTracer: Windows build fixes, bugref:9210

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/DBGFAllTracer.cpp (modified) (2 diffs)
• VMMR0/DBGFR0Tracer.cpp (modified) (1 diff)
• VMMR0/PDMR0DevHlp.cpp (modified) (1 diff)
• VMMR3/DBGFR3Tracer.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/DBGFAllTracer.cpp

@@ -56 +56 @@
 # error "No/Invalid context specified"
 #endif
-
-    return NULL;
 }
 
@@ -311 +309 @@
     DBGFTRACEREVTIOPORTSTR EvtIoPortStr;
     EvtIoPortStr.hIoPorts      = hIoPorts;
-    EvtIoPortStr.cbItem        = cbItem;
+    EvtIoPortStr.cbItem        = (uint32_t)cbItem;
     EvtIoPortStr.cTransfersReq = cTransfersReq;
     EvtIoPortStr.cTransfersRet = cTransfersRet;

trunk/src/VBox/VMM/VMMR0/DBGFR0Tracer.cpp

@@ -56 +56 @@
 DECLHIDDEN(int) dbgfR0TracerDestroy(PGVM pGVM, PDBGFTRACERINSR0 pTracer)
 {
+    RT_NOREF(pGVM);
+
     /*
      * Free the ring-3 mapping and instance memory.

trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp

@@ -49 +49 @@
 RT_C_DECLS_BEGIN
 extern DECLEXPORT(const PDMDEVHLPR0)    g_pdmR0DevHlp;
+extern DECLEXPORT(const PDMDEVHLPR0)    g_pdmR0DevHlpTracing;
 extern DECLEXPORT(const PDMPICHLP)      g_pdmR0PicHlp;
 extern DECLEXPORT(const PDMIOAPICHLP)   g_pdmR0IoApicHlp;

trunk/src/VBox/VMM/VMMR3/DBGFR3Tracer.cpp

@@ -915 +915 @@
  */
 DECLHIDDEN(int) dbgfR3TracerCreate(PVM pVM, bool fR0Enabled, const char *pszTraceFilePath,
-                                   size_t cbRingBuf, PDBGFTRACERINSR3 *ppDbgfTracerR3)
+                                   uint32_t cbRingBuf, PDBGFTRACERINSR3 *ppDbgfTracerR3)
 {
     PDBGFTRACERINSR3 pThis = NULL;
@@ -1006 +1006 @@
     {
         bool fR0Enabled;
-        uint64_t cbRingBuf = 0;
+        uint32_t cbRingBuf = 0;
         char *pszTraceFilePath = NULL;
         rc = CFGMR3QueryBoolDef(pDbgfNode, "TracerR0Enabled", &fR0Enabled, false);
         if (RT_SUCCESS(rc))
-            rc = CFGMR3QueryU64Def(pDbgfNode, "TracerRingBufSz", &cbRingBuf, _4M);
+            rc = CFGMR3QueryU32Def(pDbgfNode, "TracerRingBufSz", &cbRingBuf, _4M);
         if (RT_SUCCESS(rc))
             rc = CFGMR3QueryStringAlloc(pDbgfNode, "TracerFilePath", &pszTraceFilePath);