Changeset 99262 in vbox for trunk/src

Timestamp:

Apr 3, 2023 3:17:07 PM (2 years ago)

Author:

vboxsync

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

156645

Message:

Guest Control: Implements IGuestSession::fsQueryInfo() and IGuestSession::fsQueryFreeSpace(). bugref:10414

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (3 diffs)
• Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (2 diffs)
• HostServices/GuestControl/VBoxGuestControlSvc.cpp (modified) (1 diff)
• Main/Makefile.kmk (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/GuestCtrlImplPrivate.h (modified) (2 diffs)
• Main/include/GuestFsInfoImpl.h (added)
• Main/include/GuestSessionImpl.h (modified) (1 diff)
• Main/src-client/GuestFsInfoImpl.cpp (added)
• Main/src-client/GuestSessionImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp ¶

@@ -1260 +1260 @@
 #ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
 /**
+ * Retrieves a HOST_MSG_FS_QUERY_INFO message.
+ *
+ * @returns VBox status code.
+ * @param   pCtx                Guest control command context to use.
+ * @param   pszPath             Where to return the path of the file system object to query.
+ * @param   cbPath              Size (in bytes) of \a pszPath.
+ */
+VBGLR3DECL(int) VbglR3GuestCtrlFsGetQueryInfo(PVBGLR3GUESTCTRLCMDCTX pCtx, char *pszPath, uint32_t cbPath)
+{
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+
+    AssertPtrReturn(pszPath, VERR_INVALID_POINTER);
+    AssertReturn(cbPath, VERR_INVALID_PARAMETER);
+
+    int rc;
+    do
+    {
+        HGCMMsgFsQueryInfo Msg;
+        VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, vbglR3GuestCtrlGetMsgFunctionNo(pCtx->uClientID), pCtx->uNumParms);
+        VbglHGCMParmUInt32Set(&Msg.context, HOST_MSG_FS_QUERY_INFO);
+        VbglHGCMParmPtrSet(&Msg.path, pszPath, cbPath);
+
+        rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+        if (RT_SUCCESS(rc))
+            Msg.context.GetUInt32(&pCtx->uContextID);
+
+    } while (rc == VERR_INTERRUPTED && g_fVbglR3GuestCtrlHavePeekGetCancel);
+    return rc;
+}
+
+/**
  * Retrieves a HOST_MSG_FS_OBJ_QUERY_INFO message.
  *
@@ -2683 +2714 @@
     VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_FS_NOTIFY, GSTCTL_HGCM_REPLY_HDR_PARMS + 3);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.context, pCtx->uContextID);
-    VbglHGCMParmUInt32Set(&Msg.reply_hdr.type, GUEST_FS_NOTIFYTYPE_QUERY_INFO);
+    VbglHGCMParmUInt32Set(&Msg.reply_hdr.type, GUEST_FS_NOTIFYTYPE_QUERY_OBJ_INFO);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.rc, uRc);
 
-    VbglHGCMParmPtrSet      (&Msg.u.queryinfo.obj_info, pFsObjInfo, sizeof(GSTCTLFSOBJINFO));
-    VbglHGCMParmPtrSetString(&Msg.u.queryinfo.user,   pszUser);
-    VbglHGCMParmPtrSetString(&Msg.u.queryinfo.groups, pszGroups);
+    VbglHGCMParmPtrSet      (&Msg.u.queryobjinfo.obj_info, pFsObjInfo, sizeof(GSTCTLFSOBJINFO));
+    VbglHGCMParmPtrSetString(&Msg.u.queryobjinfo.user,   pszUser);
+    VbglHGCMParmPtrSetString(&Msg.u.queryobjinfo.groups, pszGroups);
 
     return VbglR3HGCMCall(&Msg.reply_hdr.hdr, RT_UOFFSET_AFTER(HGCMReplyFsNotify, u.queryinfo));
@@ -2732 +2763 @@
 
     return VbglR3HGCMCall(&Msg.reply_hdr.hdr, RT_UOFFSET_AFTER(HGCMReplyFsNotify, u.createtemp));
+}
+
+/**
+ * Replies to a HOST_MSG_FS_QUERY_INFO message.
+ *
+ * @returns VBox status code.
+ * @param   pCtx                Guest control command context to use.
+ * @param   uRc                 Guest rc of operation (note: IPRT-style signed int).
+ * @param   pFsInfo             File system information to return.
+ * @param   cbFsInfo            Size (in bytes) of \a pFsInfo.
+ */
+VBGLR3DECL(int) VbglR3GuestCtrlFsCbQueryInfo(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLFSINFO pFsInfo, uint32_t cbFsInfo)
+{
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    AssertPtrReturn(pFsInfo, VERR_INVALID_POINTER);
+    AssertReturn(cbFsInfo, VERR_INVALID_PARAMETER);
+
+    HGCMReplyFsNotify Msg;
+    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_FS_NOTIFY, GSTCTL_HGCM_REPLY_HDR_PARMS + 1);
+    VbglHGCMParmUInt32Set(&Msg.reply_hdr.context, pCtx->uContextID);
+    VbglHGCMParmUInt32Set(&Msg.reply_hdr.type, GUEST_FS_NOTIFYTYPE_QUERY_INFO);
+    VbglHGCMParmUInt32Set(&Msg.reply_hdr.rc, uRc);
+
+    VbglHGCMParmPtrSet(&Msg.u.queryinfo.fs_info, pFsInfo, cbFsInfo);
+
+    return VbglR3HGCMCall(&Msg.reply_hdr.hdr, RT_UOFFSET_AFTER(HGCMReplyFsNotify, u.queryinfo));
 }
 #endif /* VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS */

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp ¶

@@ -1975 +1975 @@
 
 #ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
+static int vgsvcGstCtrlSessionHandleFsQueryInfo(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+{
+    AssertPtrReturn(pSession, VERR_INVALID_POINTER);
+    AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
+
+    /*
+     * Retrieve the request.
+     */
+    char szPath[RTPATH_MAX];
+    int rc = VbglR3GuestCtrlFsGetQueryInfo(pHostCtx, szPath, sizeof(szPath));
+    if (RT_SUCCESS(rc))
+    {
+        GSTCTLFSINFO fsInfo;
+        RT_ZERO(fsInfo);
+
+        /* Query as much as we can; ignore any errors and continue. */
+        int rc2 = RTFsQuerySizes(szPath, (RTFOFF *)&fsInfo.cbTotalSize, (RTFOFF *)&fsInfo.cbFree,
+                                 &fsInfo.cbBlockSize, &fsInfo.cbSectorSize);
+        if (RT_FAILURE(rc2))
+            VGSvcError("Error calling RTFsQuerySizes() for fsqueryinfo operation: %Rrc\n", rc2);
+
+        RTFSPROPERTIES fsProps;
+        rc2 = RTFsQueryProperties(szPath, &fsProps);
+        if (RT_SUCCESS(rc2))
+        {
+            /* Regular (status) flags. */
+            fsInfo.cMaxComponent = fsProps.cbMaxComponent;
+            if (fsProps.fRemote)
+                fsInfo.fFlags |= GSTCTLFSINFO_F_IS_REMOTE;
+            if (fsProps.fCaseSensitive)
+                fsInfo.fFlags |= GSTCTLFSINFO_F_IS_CASE_SENSITIVE;
+            if (fsProps.fReadOnly)
+                fsInfo.fFlags |= GSTCTLFSINFO_F_IS_READ_ONLY;
+            if (fsProps.fCompressed)
+                fsInfo.fFlags |= GSTCTLFSINFO_F_IS_COMPRESSED;
+
+            /* Feature flags. */
+            if (fsProps.fSupportsUnicode)
+                fsInfo.fFeatures |= GSTCTLFSINFO_FEATURE_F_UNICODE;
+            if (fsProps.fFileCompression)
+                fsInfo.fFeatures |= GSTCTLFSINFO_FEATURE_F_FILE_COMPRESSION;
+        }
+        else
+            VGSvcError("Error calling RTFsQueryProperties() for fsqueryinfo operation: %Rrc\n", rc2);
+
+        rc2 = RTFsQuerySerial(szPath, &fsInfo.uSerialNumber);
+        if (RT_FAILURE(rc2))
+            VGSvcError("Error calling RTFsQuerySerial() for fsqueryinfo operation: %Rrc\n", rc2);
+
+#if 0 /** @todo Enable as soon as RTFsQueryLabel() is implemented. */
+        rc2 = RTFsQueryLabel(szPath, fsInfo.szLabel, sizeof(fsInfo.szLabel));
+        if (RT_FAILURE(rc2))
+            VGSvcError("Error calling RTFsQueryLabel() for fsqueryinfo operation: %Rrc\n", rc2);
+#endif
+
+        RTFSTYPE enmFsType;
+        rc2 = RTFsQueryType(szPath, &enmFsType);
+        if (RT_SUCCESS(rc2))
+        {
+            if (RTStrPrintf2(fsInfo.szName, sizeof(fsInfo.szName), "%s", RTFsTypeName(enmFsType)) <= 0)
+                VGSvcError("Error printing type returned by RTFsQueryType()\n");
+        }
+        else
+            VGSvcError("Error calling RTFsQueryType() for fsqueryinfo operation: %Rrc\n", rc2);
+
+#if 0 /** @todo Enable as soon as RTFsQueryMountpoint() is implemented. */
+        char szMountpoint[RTPATH_MAX];
+        rc2 = RTFsQueryMountpoint(szPath, szMountpoint, sizeof(szMountpoint));
+        if (RT_SUCCESS(rc2))
+        {
+            #error "Implement me"
+        }
+        else
+            VGSvcError("Error calling RTFsQueryMountpoint() for fsqueryinfo operation: %Rrc\n", rc2);
+#endif
+
+        if (RT_SUCCESS(rc))
+        {
+            VGSvcVerbose(3, "cbTotalSize=%RU64, cbFree=%RU64, cbBlockSize=%RU32, cbSectorSize=%RU32, fFlags=%#x, fFeatures=%#x\n",
+                         fsInfo.cbTotalSize, fsInfo.cbFree, fsInfo.cbBlockSize, fsInfo.cbSectorSize,
+                         fsInfo.fFlags, fsInfo.fFeatures);
+            VGSvcVerbose(3, "szName=%s, szLabel=%s\n", fsInfo.szName, fsInfo.szLabel);
+        }
+
+        uint32_t const cbFsInfo = sizeof(GSTCTLFSINFO); /** @todo Needs tweaking as soon as we resolve the mountpoint above. */
+
+        rc2 = VbglR3GuestCtrlFsCbQueryInfo(pHostCtx, rc, &fsInfo, cbFsInfo);
+        if (RT_FAILURE(rc2))
+        {
+            VGSvcError("Failed to reply to fsobjquerinfo request %Rrc, rc=%Rrc\n", rc, rc2);
+            if (RT_SUCCESS(rc))
+                rc = rc2;
+        }
+    }
+    else
+    {
+        VGSvcError("Error fetching parameters for fsqueryinfo operation: %Rrc\n", rc);
+        VbglR3GuestCtrlMsgSkip(pHostCtx->uClientID, rc, UINT32_MAX);
+    }
+    return rc;
+}
+
 static int vgsvcGstCtrlSessionHandleFsObjQueryInfo(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
@@ -2240 +2342 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandleFsCreateTemp(pSession, pHostCtx);
+            break;
+
+        case HOST_MSG_FS_QUERY_INFO:
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandleFsQueryInfo(pSession, pHostCtx);
             break;
 #endif /* VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS */

trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.cpp ¶

@@ -1665 +1665 @@
                     case HOST_MSG_FS_CREATE_TEMP:
                         RT_FALL_THROUGH();
+                    case HOST_MSG_FS_QUERY_INFO:
+                        RT_FALL_THROUGH();
                     case HOST_MSG_FILE_REMOVE:
                         RT_FALL_THROUGH();

trunk/src/VBox/Main/Makefile.kmk ¶

@@ -1203 +1203 @@
         src-client/GuestDirectoryImpl.cpp \
         src-client/GuestFileImpl.cpp \
+        src-client/GuestFsInfoImpl.cpp \
         src-client/GuestFsObjInfoImpl.cpp \
         src-client/GuestProcessImpl.cpp \

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

@@ -15899 +15899 @@
       <desc>
         Returns the free space (in bytes) of a given path.
-
-        <result name="E_NOTIMPL">
-          The method is not implemented yet.
-        </result>
       </desc>
       <param name="path" type="wstring" dir="in">
@@ -15915 +15911 @@
       <desc>
         Returns file system information for a given path.
-
-        <result name="E_NOTIMPL">
-          The method is not implemented yet.
-        </result>
       </desc>
 

trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h ¶

@@ -1713 +1713 @@
     union
     {
+        /** Holds information for GUEST_FS_NOTIFYTYPE_CREATE_TEMP. */
+        struct
+        {
+            /** Path of created temporary file / directory. */
+            char    *pszPath;
+            /** Size (in bytes) of \a pszPath. */
+            uint32_t cbPath;
+        } CreateTemp;
+        /** Holds information for GUEST_FS_NOTIFYTYPE_QUERY_OBJ_INFO. */
         struct
         {
@@ -1724 +1733 @@
             /** Size (in bytes) of \a pszGroups. */
             uint32_t        cbGroups;
+        } QueryObjInfo;
+        /** Holds information for GUEST_FS_NOTIFYTYPE_QUERY_INFO. */
+        struct
+        {
+            /** The actual filesystem information. */
+            GSTCTLFSINFO    fsInfo;
         } QueryInfo;
-        struct
-        {
-            /** Path of created temporary file / directory. */
-            char    *pszPath;
-            /** Size (in bytes) of \a pszPath. */
-            uint32_t cbPath;
-        } CreateTemp;
     } u;
 } CALLBACKDATA_FS_NOTIFY;

trunk/src/VBox/Main/include/GuestSessionImpl.h ¶

@@ -318 +318 @@
     int                     i_fsCreateTemp(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory,
                                            Utf8Str &strName, uint32_t fMode, bool fSecure, int *pvrcGuest);
+    int                     i_fsQueryInfo(const Utf8Str &strPath, PGSTCTLFSINFO pFsInfo, int *pvrcGuest);
     int                     i_fsObjQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pvrcGuest);
     const GuestCredentials &i_getCredentials(void);

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp ¶

@@ -39 +39 @@
 #include "GuestSessionImpl.h"
 #include "GuestSessionImplTasks.h"
+#include "GuestFsInfoImpl.h"
 #include "GuestCtrlImplPrivate.h"
 #include "VirtualBoxErrorInfoImpl.h"
@@ -2071 +2072 @@
 
 /**
- * Queries information of a file system object (file, directory, ...).
+ * Queries information of a guest file system.
  *
  * @return  IPRT status code.
  * @param   strPath             Path to file system object to query information for.
- * @param   fFollowSymlinks     Whether to follow symbolic links or not.
- * @param   objData             Where to return the file system object data, if found.
+ * @param   pFsInfo             Where to return the file system information on success.
  * @param   pvrcGuest           Guest VBox status code, when returning
  *                              VERR_GSTCTL_GUEST_ERROR. Any other return code
  *                              indicates some host side error.
  */
-int GuestSession::i_fsObjQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pvrcGuest)
+int GuestSession::i_fsQueryInfo(const Utf8Str &strPath, PGSTCTLFSINFO pFsInfo, int *pvrcGuest)
 {
     LogFlowThisFunc(("strPath=%s\n", strPath.c_str()));
@@ -2096 +2096 @@
             return vrc;
 
-        uint32_t const fFlags = fFollowSymlinks ? GSTCTL_PATH_F_FOLLOW_LINK : GSTCTL_PATH_F_ON_LINK;
-
         /* Prepare HGCM call. */
-        VBOXHGCMSVCPARM paParms[4];
+        VBOXHGCMSVCPARM paParms[2];
         int i = 0;
         HGCMSvcSetU32(&paParms[i++], pEvent->ContextID());
         HGCMSvcSetStr(&paParms[i++], strPath.c_str());
-        HGCMSvcSetU32(&paParms[i++], GSTCTLFSOBJATTRADD_UNIX /* Implicit */);
-        HGCMSvcSetU32(&paParms[i++], fFlags);
 
         alock.release(); /* Drop lock before sending. */
 
-        vrc = i_sendMessage(HOST_MSG_FS_OBJ_QUERY_INFO, i, paParms);
+        vrc = i_sendMessage(HOST_MSG_FS_QUERY_INFO, i, paParms);
         if (RT_SUCCESS(vrc))
         {
@@ -2120 +2116 @@
                 {
                     AssertReturn(pFsNotify->uType == GUEST_FS_NOTIFYTYPE_QUERY_INFO, VERR_INVALID_PARAMETER);
-                    objData.Init(strPath);
-                    vrc = objData.FromGuestFsObjInfo(&pFsNotify->u.QueryInfo.objInfo);
-                    RTStrFree(pFsNotify->u.QueryInfo.pszUser);
-                    RTStrFree(pFsNotify->u.QueryInfo.pszGroups);
+                    memcpy(pFsInfo, &pFsNotify->u.QueryInfo.fsInfo, sizeof(GSTCTLFSINFO));
                 }
                 else
@@ -2143 +2136 @@
 #endif /* VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS */
     {
+        vrc = VERR_NOT_SUPPORTED;
+    }
+
+    LogFlowThisFunc(("Returning vrc=%Rrc, vrcGuest=%Rrc\n", vrc, pvrcGuest ? *pvrcGuest : VERR_IPE_UNINITIALIZED_STATUS));
+    return vrc;
+}
+
+/**
+ * Queries information of a file system object (file, directory, ...).
+ *
+ * @return  IPRT status code.
+ * @param   strPath             Path to file system object to query information for.
+ * @param   fFollowSymlinks     Whether to follow symbolic links or not.
+ * @param   objData             Where to return the file system object data, if found.
+ * @param   pvrcGuest           Guest VBox status code, when returning
+ *                              VERR_GSTCTL_GUEST_ERROR. Any other return code
+ *                              indicates some host side error.
+ */
+int GuestSession::i_fsObjQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pvrcGuest)
+{
+    LogFlowThisFunc(("strPath=%s\n", strPath.c_str()));
+
+    int vrc;
+#ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
+    if (mParent->i_getGuestControlFeatures0() & VBOX_GUESTCTRL_GF_0_TOOLBOX_AS_CMDS)
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+        GuestWaitEvent *pEvent = NULL;
+        vrc = registerWaitEvent(mData.mSession.mID, mData.mObjectID, &pEvent);
+        if (RT_FAILURE(vrc))
+            return vrc;
+
+        uint32_t const fFlags = fFollowSymlinks ? GSTCTL_PATH_F_FOLLOW_LINK : GSTCTL_PATH_F_ON_LINK;
+
+        /* Prepare HGCM call. */
+        VBOXHGCMSVCPARM paParms[4];
+        int i = 0;
+        HGCMSvcSetU32(&paParms[i++], pEvent->ContextID());
+        HGCMSvcSetStr(&paParms[i++], strPath.c_str());
+        HGCMSvcSetU32(&paParms[i++], GSTCTLFSOBJATTRADD_UNIX /* Implicit */);
+        HGCMSvcSetU32(&paParms[i++], fFlags);
+
+        alock.release(); /* Drop lock before sending. */
+
+        vrc = i_sendMessage(HOST_MSG_FS_OBJ_QUERY_INFO, i, paParms);
+        if (RT_SUCCESS(vrc))
+        {
+            vrc = pEvent->Wait(30 * 1000);
+            if (RT_SUCCESS(vrc))
+            {
+                PCALLBACKDATA_FS_NOTIFY const pFsNotify = (PCALLBACKDATA_FS_NOTIFY)pEvent->Payload().Raw();
+                AssertPtrReturn(pFsNotify, VERR_INVALID_POINTER);
+                int vrcGuest = (int)pFsNotify->rc;
+                if (RT_SUCCESS(vrcGuest))
+                {
+                    AssertReturn(pFsNotify->uType == GUEST_FS_NOTIFYTYPE_QUERY_OBJ_INFO, VERR_INVALID_PARAMETER);
+                    objData.Init(strPath);
+                    vrc = objData.FromGuestFsObjInfo(&pFsNotify->u.QueryObjInfo.objInfo);
+                    RTStrFree(pFsNotify->u.QueryObjInfo.pszUser);
+                    RTStrFree(pFsNotify->u.QueryObjInfo.pszGroups);
+                }
+                else
+                {
+                    if (pvrcGuest)
+                        *pvrcGuest = vrcGuest;
+                    vrc = VERR_GSTCTL_GUEST_ERROR;
+                }
+            }
+            else
+            {
+                if (pEvent->HasGuestError() && pvrcGuest)
+                    *pvrcGuest = pEvent->GuestResult();
+            }
+        }
+        unregisterWaitEvent(pEvent);
+    }
+    else
+#endif /* VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS */
+    {
         vrc = i_fsObjQueryInfoViaToolbox(strPath, fFollowSymlinks, objData, pvrcGuest);
     }
@@ -2348 +2421 @@
         switch (dataCb.uType)
         {
-            case GUEST_FS_NOTIFYTYPE_QUERY_INFO:
-            {
-                AssertBreakStmt(pSvcCbData->mParms >= 6, vrc = VERR_INVALID_PARAMETER);
-                PGSTCTLFSOBJINFO pObjInfo;
-                uint32_t         cbObjInfo;
-                vrc = HGCMSvcGetPv(&pSvcCbData->mpaParms[3], (void **)&pObjInfo, &cbObjInfo);
-                AssertRCBreak(vrc);
-                AssertBreakStmt(cbObjInfo == sizeof(GSTCTLFSOBJINFO), vrc = VERR_INVALID_PARAMETER);
-                memcpy(&dataCb.u.QueryInfo.objInfo, pObjInfo, sizeof(GSTCTLFSOBJINFO));
-
-                char    *pszUser;
-                uint32_t cbUser;
-                vrc = HGCMSvcGetStr(&pSvcCbData->mpaParms[4], &pszUser, &cbUser);
-                AssertRCBreak(vrc);
-                dataCb.u.QueryInfo.pszUser = RTStrDup(pszUser);
-                AssertPtrBreakStmt(dataCb.u.QueryInfo.pszUser, vrc = VERR_NO_MEMORY);
-                dataCb.u.QueryInfo.cbUser  = cbUser;
-
-                char    *pszGroups;
-                uint32_t cbGroups;
-                vrc = HGCMSvcGetStr(&pSvcCbData->mpaParms[5], &pszGroups, &cbGroups);
-                AssertRCBreak(vrc);
-                dataCb.u.QueryInfo.pszGroups = RTStrDup(pszGroups);
-                AssertPtrBreakStmt(dataCb.u.QueryInfo.pszGroups, vrc = VERR_NO_MEMORY);
-                dataCb.u.QueryInfo.cbGroups  = cbGroups;
-                break;
-            }
-
             case GUEST_FS_NOTIFYTYPE_CREATE_TEMP:
             {
@@ -2385 +2430 @@
                 AssertPtrBreakStmt(dataCb.u.CreateTemp.pszPath, vrc = VERR_NO_MEMORY);
                 dataCb.u.CreateTemp.cbPath  = cbPath;
+                break;
+            }
+
+            case GUEST_FS_NOTIFYTYPE_QUERY_OBJ_INFO:
+            {
+                AssertBreakStmt(pSvcCbData->mParms >= 6, vrc = VERR_INVALID_PARAMETER);
+                PGSTCTLFSOBJINFO pObjInfo;
+                uint32_t         cbObjInfo;
+                vrc = HGCMSvcGetPv(&pSvcCbData->mpaParms[3], (void **)&pObjInfo, &cbObjInfo);
+                AssertRCBreak(vrc);
+                AssertBreakStmt(cbObjInfo == sizeof(GSTCTLFSOBJINFO), vrc = VERR_INVALID_PARAMETER);
+                memcpy(&dataCb.u.QueryObjInfo.objInfo, pObjInfo, sizeof(GSTCTLFSOBJINFO));
+
+                char    *pszUser;
+                uint32_t cbUser;
+                vrc = HGCMSvcGetStr(&pSvcCbData->mpaParms[4], &pszUser, &cbUser);
+                AssertRCBreak(vrc);
+                dataCb.u.QueryObjInfo.pszUser = RTStrDup(pszUser);
+                AssertPtrBreakStmt(dataCb.u.QueryObjInfo.pszUser, vrc = VERR_NO_MEMORY);
+                dataCb.u.QueryObjInfo.cbUser  = cbUser;
+
+                char    *pszGroups;
+                uint32_t cbGroups;
+                vrc = HGCMSvcGetStr(&pSvcCbData->mpaParms[5], &pszGroups, &cbGroups);
+                AssertRCBreak(vrc);
+                dataCb.u.QueryObjInfo.pszGroups = RTStrDup(pszGroups);
+                AssertPtrBreakStmt(dataCb.u.QueryObjInfo.pszGroups, vrc = VERR_NO_MEMORY);
+                dataCb.u.QueryObjInfo.cbGroups  = cbGroups;
+                break;
+            }
+
+            case GUEST_FS_NOTIFYTYPE_QUERY_INFO:
+            {
+                AssertBreakStmt(pSvcCbData->mParms >= 2, vrc = VERR_INVALID_PARAMETER);
+                PGSTCTLFSINFO pFsInfo;
+                uint32_t      cbFsInfo;
+                vrc = HGCMSvcGetPv(&pSvcCbData->mpaParms[3], (void **)&pFsInfo, &cbFsInfo);
+                AssertRCBreak(vrc);
+                AssertBreakStmt(cbFsInfo == sizeof(GSTCTLFSINFO), vrc = VERR_INVALID_PARAMETER);
+                memcpy(&dataCb.u.QueryInfo.fsInfo, pFsInfo, sizeof(GSTCTLFSINFO));
                 break;
             }
@@ -4722 +4807 @@
 HRESULT GuestSession::fsQueryFreeSpace(const com::Utf8Str &aPath, LONG64 *aFreeSpace)
 {
-    RT_NOREF(aPath, aFreeSpace);
-
-    return E_NOTIMPL;
+    ComPtr<IGuestFsInfo> pFsInfo;
+    HRESULT hrc = fsQueryInfo(aPath, pFsInfo);
+    if (SUCCEEDED(hrc))
+        hrc = pFsInfo->COMGETTER(FreeSize)(aFreeSpace);
+
+    return hrc;
 }
 
 HRESULT GuestSession::fsQueryInfo(const com::Utf8Str &aPath, ComPtr<IGuestFsInfo> &aInfo)
 {
-    RT_NOREF(aPath, aInfo);
-
-    return E_NOTIMPL;
+    if (aPath.isEmpty())
+        return setError(E_INVALIDARG, tr("No path specified"));
+
+    HRESULT hrc = i_isStartedExternal();
+    if (FAILED(hrc))
+        return hrc;
+
+    GSTCTLFSINFO fsInfo;
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_fsQueryInfo(aPath, &fsInfo, &vrcGuest);
+    if (RT_SUCCESS(vrc))
+    {
+        ComObjPtr<GuestFsInfo> ptrFsInfo;
+        hrc = ptrFsInfo.createObject();
+        if (SUCCEEDED(hrc))
+        {
+            vrc = ptrFsInfo->init(&fsInfo);
+            if (RT_SUCCESS(vrc))
+                hrc = ptrFsInfo.queryInterfaceTo(aInfo.asOutParam());
+            else
+                hrc = setErrorVrc(vrc);
+        }
+    }
+    else
+    {
+        if (GuestProcess::i_isGuestError(vrc))
+        {
+            GuestErrorInfo ge(GuestErrorInfo::Type_Fs, vrcGuest, aPath.c_str());
+            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Querying guest filesystem information failed: %s"),
+                               GuestBase::getErrorAsString(ge).c_str());
+        }
+        else
+            hrc = setErrorVrc(vrc, tr("Querying guest filesystem information for \"%s\" failed: %Rrc"), aPath.c_str(), vrc);
+    }
+
+    return hrc;
 }
 
@@ -4807 +4928 @@
         {
             GuestErrorInfo ge(GuestErrorInfo::Type_Fs, vrcGuest, aPath.c_str());
-            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Querying guest file information failed: %s"),
+            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Querying guest filesystem object information failed: %s"),
                                GuestBase::getErrorAsString(ge).c_str());
         }
         else
-            hrc = setErrorVrc(vrc, tr("Querying guest file information for \"%s\" failed: %Rrc"), aPath.c_str(), vrc);
+            hrc = setErrorVrc(vrc, tr("Querying guest filesystem object information for \"%s\" failed: %Rrc"), aPath.c_str(), vrc);
     }