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

Timestamp:

Jul 22, 2013 11:19:20 AM (12 years ago)

Author:

vboxsync

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

87431

Message:

Guest user state reporting: Update.

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (4 diffs)
• VMMDevState.h (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -593 +593 @@
 }
 
+
 /**
  * Handles VMMDevReq_ReportGuestStatus.
@@ -642 +643 @@
 
         pEntry->TimeSpecTS = Now;
-        pEntry->uStatus    = (uint16_t)pStatus->status;
+        pEntry->uStatus    = (uint16_t)pStatus->status; /** @todo r=andy uint16_t vs. 32-bit enum. */
         pEntry->fFlags     = pStatus->flags;
     }
@@ -648 +649 @@
     if (pThis->pDrv && pThis->pDrv->pfnUpdateGuestStatus)
         pThis->pDrv->pfnUpdateGuestStatus(pThis->pDrv, pStatus->facility, pStatus->status, pStatus->flags, &Now);
+
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Handles VMMDevReq_ReportGuestUserState.
+ *
+ * @returns VBox status code that the guest should see.
+ * @param   pThis           The VMMDev instance data.
+ * @param   pReqHdr         The header of the request to handle.
+ */
+static int vmmdevReqHandler_ReportGuestUserState(PVMMDEV pThis, VMMDevRequestHeader *pReqHdr)
+{
+    /*
+     * Validate input.
+     */
+    AssertMsgReturn(pReqHdr->size >= sizeof(VMMDevReportGuestUserState), ("%u\n", pReqHdr->size), VERR_INVALID_PARAMETER);
+    VBoxGuestUserStatus *pStatus = &((VMMDevReportGuestUserState *)pReqHdr)->status;
+
+    if (   pThis->pDrv
+        && pThis->pDrv->pfnUpdateGuestUserState)
+    {
+        AssertPtr(pStatus);
+
+        if (   pReqHdr->size      > _2K
+            || pStatus->cbUser    > 256
+            || pStatus->cbDomain  > 256
+            || pStatus->cbDetails > _1K) /* Play safe. */
+        {
+            return VERR_INVALID_PARAMETER;
+        }
+
+        pThis->pDrv->pfnUpdateGuestUserState(pThis->pDrv,
+                                             /* User name */
+                                             (const char *)pStatus->szUser,
+                                             /* Domain */
+                                               pStatus->cbDomain
+                                             ? (const char *)pStatus->szUser[pStatus->cbUser]
+                                             : NULL,
+                                             /* State */
+                                             (uint32_t)pStatus->state,
+                                             /* State details */
+                                               pStatus->cbDetails
+                                             ? (uint8_t *)pStatus->szUser[pStatus->cbUser + pStatus->cbDomain]
+                                             : NULL,
+                                             pStatus->cbDetails);
+    }
 
     return VINF_SUCCESS;
@@ -2217 +2266 @@
         case VMMDevReq_ReportGuestStatus:
             pReqHdr->rc = vmmdevReqHandler_ReportGuestStatus(pThis, pReqHdr);
+            break;
+
+        case VMMDevReq_ReportGuestUserState:
+            pReqHdr->rc = vmmdevReqHandler_ReportGuestUserState(pThis, pReqHdr);
             break;
 

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -96 +96 @@
     uint32_t    uFacility;
     /** The status, see VBoxGuestFacilityStatus. */
+    /** @todo r=andy uint16_t vs. uint32_t (VBoxGuestFacilityStatus enum). */
     uint16_t    uStatus;
     /** Whether this entry is fixed and cannot be reused when inactive. */