Changeset 55885 in vbox

Timestamp:

May 16, 2015 1:03:11 PM (9 years ago)

Author:

vboxsync

Message:

IMachineDebugger: Added a queryOSKernelLog method.

Location:

trunk

Files:

• include/iprt/cpp/ministring.h (modified) (2 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (3 diffs)
• src/VBox/Main/include/MachineDebuggerImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/MachineDebuggerImpl.cpp (modified) (1 diff)

trunk/include/iprt/cpp/ministring.h

@@ -248 +248 @@
            )
         {
-            int vrc = RTStrRealloc(&m_psz, cb);
-            if (RT_SUCCESS(vrc))
+            int rc = RTStrRealloc(&m_psz, cb);
+            if (RT_SUCCESS(rc))
                 m_cbAllocated = cb;
 #ifdef RT_EXCEPTIONS_ENABLED
@@ -256 +256 @@
 #endif
         }
+    }
+
+    /**
+     * A C like version of the reserve method, i.e. return code instead of throw.
+     *
+     * @returns VINF_SUCCESS or VERR_NO_STRING_MEMORY.
+     * @param   cb              New minimum size (in bytes) of member memory buffer.
+     */
+    int reserveNoThrow(size_t cb)
+    {
+        if (    cb != m_cbAllocated
+             && cb > m_cch + 1
+           )
+        {
+            int rc = RTStrRealloc(&m_psz, cb);
+            if (RT_SUCCESS(rc))
+                m_cbAllocated = cb;
+            else
+                return rc;
+        }
+        return VINF_SUCCESS;
     }
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -17164 +17164 @@
   <interface
     name="IMachineDebugger" extends="$unknown"
-    uuid="b08d5aa9-4e35-3a17-2e4d-61948b590989"
+    uuid="ae7afb78-4265-8c03-ccb9-33a7970057e3"
     wsmap="managed"
     >
@@ -17379 +17379 @@
     </method>
 
+    <method name="queryOSKernelLog">
+      <desc>
+        Tries to get the kernel log (dmesg) of the guest OS.
+
+      </desc>
+      <param name="maxMessages" type="unsigned long" dir="in">
+        <desc>Max number of messages to return, counting from the end of the
+          log.  If 0, there is no limit.</desc>
+      </param>
+      <param name="dmesg" type="wstring" dir="return">
+        <desc>
+          The kernel log.
+        </desc>
+      </param>
+    </method>
+
     <method name="getRegister">
       <desc>
         Gets one register.
-
-        This feature is not implemented in the 4.0.0 release but may show up
-        in a dot release.
       </desc>
       <param name="cpuId" type="unsigned long" dir="in">
@@ -17403 +17416 @@
       <desc>
         Gets all the registers for the given CPU.
-
-        This feature is not implemented in the 4.0.0 release but may show up
-        in a dot release.
       </desc>
       <param name="cpuId" type="unsigned long" dir="in">

trunk/src/VBox/Main/include/MachineDebuggerImpl.h

@@ -107 +107 @@
     HRESULT unloadPlugIn(const com::Utf8Str &aName);
     HRESULT detectOS(com::Utf8Str &aOs);
+    HRESULT queryOSKernelLog(ULONG aMaxMessages,
+                             com::Utf8Str &aDmesg);
     HRESULT getRegister(ULONG aCpuId,
                         const com::Utf8Str &aName,

trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp

@@ -1183 +1183 @@
         else
             hrc = setError(VBOX_E_VM_ERROR, tr("DBGFR3OSDetect failed with %Rrc"), vrc);
+    }
+    return hrc;
+}
+
+HRESULT MachineDebugger::queryOSKernelLog(ULONG aMaxMessages, com::Utf8Str &aDmesg)
+{
+    /*
+     * Lock the debugger and get the VM pointer
+     */
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    Console::SafeVMPtr ptrVM(mParent);
+    HRESULT hrc = ptrVM.rc();
+    if (SUCCEEDED(hrc))
+    {
+        PDBGFOSIDMESG pDmesg = (PDBGFOSIDMESG)DBGFR3OSQueryInterface(ptrVM.rawUVM(), DBGFOSINTERFACE_DMESG);
+        if (pDmesg)
+        {
+            size_t   cbActual;
+            size_t   cbBuf  = _512K;
+            int vrc = aDmesg.reserveNoThrow(cbBuf);
+            if (RT_SUCCESS(vrc))
+            {
+                uint32_t cMessages = aMaxMessages == 0 ? UINT32_MAX : aMaxMessages;
+                vrc = pDmesg->pfnQueryKernelLog(pDmesg, ptrVM.rawUVM(), 0 /*fFlags*/, cMessages,
+                                                aDmesg.mutableRaw(), cbBuf, &cbActual);
+
+                uint32_t cTries = 10;
+                while (vrc == VERR_BUFFER_OVERFLOW && cbBuf < 16*_1M && cTries-- > 0)
+                {
+                    cbBuf = RT_ALIGN_Z(cbActual + _4K, _4K);
+                    int vrc = aDmesg.reserveNoThrow(cbBuf);
+                    if (RT_SUCCESS(vrc))
+                        vrc = pDmesg->pfnQueryKernelLog(pDmesg, ptrVM.rawUVM(), 0 /*fFlags*/, cMessages,
+                                                        aDmesg.mutableRaw(), cbBuf, &cbActual);
+                }
+                if (RT_SUCCESS(vrc))
+                    aDmesg.jolt();
+                else if (vrc == VERR_BUFFER_OVERFLOW)
+                    hrc = setError(E_FAIL, "Too much log available, must use the maxMessages parameter to restrict.");
+                else
+                    hrc = setErrorVrc(vrc);
+            }
+            else
+                hrc = setErrorBoth(E_OUTOFMEMORY, vrc);
+        }
+        else
+            hrc = setError(E_FAIL, "The dmesg interface isn't implemented by guest OS digger, or detectOS() has not been called.");
     }
     return hrc;