Changeset 86105 in vbox for trunk/src/VBox/Debugger/DBGCTcp.cpp

Timestamp:

Sep 13, 2020 8:28:59 AM (4 years ago)

Author:

vboxsync

Message:

Debugger/RemoteKd: Add beginnings of debug stub talking the KD remote protocol (WinDbg and friends), heavy work in progress

File:

• trunk/src/VBox/Debugger/DBGCTcp.cpp (modified) (2 diffs)

trunk/src/VBox/Debugger/DBGCTcp.cpp

@@ -223 +223 @@
     PUVM pUVM = (PUVM)pvUser;
     PCFGMNODE pKey = CFGMR3GetChild(CFGMR3GetRootU(pUVM), "DBGC");
-    bool fGdbStub = false;
-    int rc = CFGMR3QueryBoolDef(pKey, "GdbStub", &fGdbStub, false);
-    if (RT_FAILURE(rc))
-        return VM_SET_ERROR_U(pUVM, rc, "Configuration error: Failed querying \"DBGC/GdbStub\"");
+    char *pszStubType = NULL;
+    int rc = CFGMR3QueryStringAllocDef(pKey, "StubType", &pszStubType, "Native");
+    if (RT_FAILURE(rc))
+        return VM_SET_ERROR_U(pUVM, rc, "Configuration error: Failed querying \"DBGC/StubType\"");
 
     /*
@@ -234 +234 @@
     DbgcTcp.Back.pfnInput     = dbgcTcpBackInput;
     DbgcTcp.Back.pfnRead      = dbgcTcpBackRead;
-    if (fGdbStub)
-        DbgcTcp.Back.pfnWrite = dbgcTcpBackWriteRaw;
-    else
-        DbgcTcp.Back.pfnWrite = dbgcTcpBackWrite;
     DbgcTcp.Back.pfnSetReady  = dbgcTcpBackSetReady;
     DbgcTcp.fAlive = true;
     DbgcTcp.Sock   = Sock;
-    if (fGdbStub)
+
+    if (!RTStrICmp(pszStubType, "gdb"))
+    {
+        DbgcTcp.Back.pfnWrite = dbgcTcpBackWriteRaw;
         rc = dbgcGdbStubCreate(pUVM, &DbgcTcp.Back, 0);
+    }
+    else if (!RTStrICmp(pszStubType, "kd"))
+    {
+        DbgcTcp.Back.pfnWrite = dbgcTcpBackWriteRaw;
+        rc = dbgcKdStubCreate(pUVM, &DbgcTcp.Back, 0);
+    }
+    else if (!RTStrICmp(pszStubType, "native"))
+    {
+        DbgcTcp.Back.pfnWrite = dbgcTcpBackWrite;
+        rc = DBGCCreate(pUVM, &DbgcTcp.Back, 0);
+    }
     else
-        rc = DBGCCreate(pUVM, &DbgcTcp.Back, 0);
+        rc = VM_SET_ERROR_U(pUVM, VERR_INVALID_PARAMETER, "Configuration error: \"DBGC/StubType\" contains an invalid type");
+
     LogFlow(("dbgcTcpConnection: disconnect rc=%Rrc\n", rc));
     return rc;