Changeset 40767 in vbox

Timestamp:

Apr 5, 2012 9:47:33 AM (12 years ago)

Author:

vboxsync

Message:

also enumerate guest properties during guru meditation

Location:

trunk

Files:

• include/VBox/HostServices/GuestPropertySvc.h (modified) (1 diff)
• src/VBox/HostServices/GuestProperties/service.cpp (modified) (5 diffs)
• src/VBox/Main/include/ConsoleImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -260 +260 @@
      * Takes one 32-bit unsigned integer parameter for the flags.
      */
-    SET_GLOBAL_FLAGS_HOST = 7
+    SET_GLOBAL_FLAGS_HOST = 7,
+
+    /**
+     * Return the pointer to a debug info function enumerating all guest properties.
+     */
+    GET_DBGF_INFO_FN = 8
 };
 

trunk/src/VBox/HostServices/GuestProperties/service.cpp

@@ -52 +52 @@
 #include <iprt/thread.h>
 #include <iprt/time.h>
+#include <VBox/vmm/dbgf.h>
 
 #include <memory>  /* for auto_ptr */
@@ -359 +360 @@
         return VINF_SUCCESS;
     }
+
 private:
     static DECLCALLBACK(int) reqThreadFn(RTTHREAD ThreadSelf, void *pvUser);
@@ -383 +385 @@
     int hostCall(uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int uninit();
+    void dbgInfoShow(PCDBGFINFOHLP pHlp);
+    static DECLCALLBACK(void) dbgInfo(void *pvUser, PCDBGFINFOHLP pHlp, const char *pszArgs);
 };
 
@@ -1252 +1256 @@
 }
 
+/**
+ * Enumeration data shared between dbgInfoCallback and Service::dbgInfoShow.
+ */
+typedef struct ENUMDBGINFO
+{
+    PCDBGFINFOHLP pHlp;
+} ENUMDBGINFO;
+
+static DECLCALLBACK(int) dbgInfoCallback(PRTSTRSPACECORE pStr, void *pvUser)
+{
+    Property *pProp = (Property *)pStr;
+    PCDBGFINFOHLP pHlp = ((ENUMDBGINFO*)pvUser)->pHlp;
+
+    char szFlags[MAX_FLAGS_LEN];
+    int rc = writeFlags(pProp->mFlags, szFlags);
+    if (RT_FAILURE(rc))
+        RTStrPrintf(szFlags, sizeof(szFlags), "???");
+
+    pHlp->pfnPrintf(pHlp, "%s: '%s', %RU64",
+                    pProp->mName.c_str(), pProp->mValue.c_str(), pProp->mTimestamp);
+    if (strlen(szFlags))
+        pHlp->pfnPrintf(pHlp, " (%s)", szFlags);
+    pHlp->pfnPrintf(pHlp, "\n");
+    return 0;
+}
+
+void Service::dbgInfoShow(PCDBGFINFOHLP pHlp)
+{
+    ENUMDBGINFO EnumData = { pHlp };
+    RTStrSpaceEnumerate(&mhProperties, dbgInfoCallback, &EnumData);
+}
+
+/**
+ * Handler for debug info.
+ *
+ * @param   pvUser      user pointer.
+ * @param   pHlp        The info helper functions.
+ * @param   pszArgs     Arguments, ignored.
+ */
+void Service::dbgInfo(void *pvUser, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    SELF *pSelf = reinterpret_cast<SELF *>(pvUser);
+    pSelf->dbgInfoShow(pHlp);
+}
+
 
 /**
@@ -1317 +1366 @@
                 else
                     rc = VERR_INVALID_PARAMETER;
+                break;
+
+            case GET_DBGF_INFO_FN:
+                if (cParms != 2)
+                    return VERR_INVALID_PARAMETER;
+                paParms[0].u.pointer.addr = (void*)(uintptr_t)dbgInfo;
+                paParms[1].u.pointer.addr = (void*)this;
                 break;
 

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

@@ -580 +580 @@
                       bool fAttachDetach, bool fIgnoreConnectFailure);
 
-    static DECLCALLBACK(int) configGuestProperties(void *pvConsole);
+    static DECLCALLBACK(int) configGuestProperties(void *pvConsole, PVM pVM);
     static DECLCALLBACK(int) configGuestControl(void *pvConsole);
     static DECLCALLBACK(void) vmstateChangeCallback(PVM aVM, VMSTATE aState,

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

@@ -2571 +2571 @@
          */
 
-        rc = configGuestProperties(this);
+        rc = configGuestProperties(this, pVM);
 #endif /* VBOX_WITH_GUEST_PROPS defined */
 
@@ -4736 +4736 @@
  * the machine XML and set a couple of initial properties.
  */
-/* static */ int Console::configGuestProperties(void *pvConsole)
+/* static */ int Console::configGuestProperties(void *pvConsole, PVM pVM)
 {
 #ifdef VBOX_WITH_GUEST_PROPS
@@ -4760 +4760 @@
          * change.
          */
+
+        {
+            VBOXHGCMSVCPARM Params[2];
+            pConsole->m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", guestProp::GET_DBGF_INFO_FN, 2, &Params[0]);
+            PFNDBGFHANDLEREXT pfnHandler = (PFNDBGFHANDLEREXT)(uintptr_t)Params[0].u.pointer.addr;
+            void *pService = (void*)Params[1].u.pointer.addr;
+            DBGFR3InfoRegisterExternal(pVM, "guestprops", "Display the guest properties", pfnHandler, pService);
+        }
 
         /* Sysprep execution by VBoxService. */