Changeset 104894 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 12, 2024 1:53:43 PM (11 months ago)

Author:

vboxsync

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

163496

Message:

Devices/Trace: Add support for tracing the ITPMCONNECTOR interface and start with a decoder plugin for dissecting TPM command/respons buffers, bugref:10701

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (2 diffs)
• Trace/DrvIfsTrace-tpm.cpp (added)
• Trace/DrvIfsTrace.cpp (modified) (4 diffs)
• Trace/DrvIfsTraceInternal.h (modified) (5 diffs)
• Trace/VBoxTraceLogDecoders.cpp (added)

trunk/src/VBox/Devices/Makefile.kmk

@@ -245 +245 @@
         Network/Pcap.cpp \
         Trace/DrvIfsTrace.cpp \
-        Trace/DrvIfsTrace-serial.cpp
+        Trace/DrvIfsTrace-serial.cpp \
+        Trace/DrvIfsTrace-tpm.cpp
  ifn1of ($(KBUILD_TARGET), os2)
   VBoxDD_SOURCES += Storage/DrvHostBase.cpp
@@ -1802 +1803 @@
 endif # defined(VBOX_WITH_VMSVGA3D) && !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""
 
+
+#
+# The decoder library for the tracing driver.
+#
+DLLS += VBoxTraceLogDecoders
+VBoxTraceLogDecoders_TEMPLATE      = VBoxR3Dll
+VBoxTraceLogDecoders_LDFLAGS.linux = $(VBOX_GCC_NO_UNDEFINED)
+VBoxTraceLogDecoders_SOURCES       = \
+        Trace/VBoxTraceLogDecoders.cpp
+VBoxTraceLogDecoders_SOURCES.win   = \
+        Trace/VBoxTraceLogDecoders.rc
+VBoxTraceLogDecoders_LIBS          = $(LIB_RUNTIME)
+
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/Devices/Trace/DrvIfsTrace.cpp

@@ -61 +61 @@
         PDMIBASE_RETURN_INTERFACE(pszIID, PDMISERIALPORT, &pThis->ISerialPort);
 
+    if (pThis->pITpmConBelow)
+        PDMIBASE_RETURN_INTERFACE(pszIID, PDMITPMCONNECTOR, &pThis->ITpmConnector);
+    if (pThis->pITpmPortAbove)
+        PDMIBASE_RETURN_INTERFACE(pszIID, PDMITPMPORT, &pThis->ITpmPort);
+
     return NULL;
 }
@@ -116 +121 @@
 
     drvIfsTrace_SerialIfInit(pThis);
+    drvIfsTrace_TpmIfInit(pThis);
 
     /*
@@ -133 +139 @@
      */
     pThis->pISerialPortAbove = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMISERIALPORT);
+    pThis->pITpmPortAbove    = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMITPMPORT);
 
     /*
@@ -142 +149 @@
 
     pThis->pISerialConBelow = PDMIBASE_QUERY_INTERFACE(pIBaseBelow, PDMISERIALCONNECTOR);
+    pThis->pITpmConBelow    = PDMIBASE_QUERY_INTERFACE(pIBaseBelow, PDMITPMCONNECTOR);
 
     return VINF_SUCCESS;

trunk/src/VBox/Devices/Trace/DrvIfsTraceInternal.h

@@ -34 +34 @@
 #include <VBox/vmm/pdmdrv.h>
 #include <VBox/vmm/pdmserialifs.h>
+#include <VBox/vmm/pdmtpmifs.h>
 
 #include <iprt/types.h>
@@ -48 +49 @@
     PDMISERIALPORT       ISerialPort;
     PDMISERIALCONNECTOR  ISerialConnector;
+    PDMITPMPORT          ITpmPort;
+    PDMITPMCONNECTOR     ITpmConnector;
     /** @}  */
 
@@ -53 +56 @@
      * @{ */
     PPDMISERIALCONNECTOR pISerialConBelow;
+    PPDMITPMCONNECTOR    pITpmConBelow;
     /** @} */
 
@@ -58 +62 @@
      * @{ */
     PPDMISERIALPORT      pISerialPortAbove;
+    PPDMITPMPORT         pITpmPortAbove;
     /** @} */
 
@@ -73 +78 @@
 
 DECLHIDDEN(void) drvIfsTrace_SerialIfInit(PDRVIFTRACE pThis);
+DECLHIDDEN(void) drvIfsTrace_TpmIfInit(PDRVIFTRACE pThis);
 
 #endif /* !VBOX_INCLUDED_SRC_Trace_DrvIfsTraceInternal_h */