vbox的更動 39890 路徑 trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

時間撮記:

2012-1-26 下午07:42:19 (13 年 以前)

作者:

vboxsync

訊息:

VMMDev,IGuest,IAdditionsFacility,VBoxGuest,iprt/types.h: VMMDev must track the guest facility reports so they can be saved and restored correctly. Also fixed a reset bug related to guestInfo2. Restrict who can report the status of which facilities. Recalc the runlevel based on which facilities are active. Restrict the number of facilities main tracks.

檔案:

• trunk/src/VBox/Main/src-client/VMMDevInterface.cpp (修改) (3 筆差異)

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

@@ -158 +158 @@
 
 /**
- * Reports Guest Additions status.
- * Called whenever the Additions issue a guest status report request or the VM is reset.
- *
- * @param   pInterface          Pointer to this interface.
- * @param   guestInfo           Pointer to guest information structure
- * @thread  The emulation thread.
- */
-DECLCALLBACK(void) vmmdevUpdateGuestStatus(PPDMIVMMDEVCONNECTOR pInterface, const VBoxGuestStatus *guestStatus)
-{
-    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
-
-    Assert(guestStatus);
-    if (!guestStatus)
-        return;
-
+ * @interface_method_impl{PDMIVMMDEVCONNECTOR,pfnUpdateGuestStatus}
+ */
+DECLCALLBACK(void) vmmdevUpdateGuestStatus(PPDMIVMMDEVCONNECTOR pInterface, uint32_t uFacility, uint16_t uStatus,
+                                           uint32_t fFlags, PCRTTIMESPEC pTimeSpecTS)
+{
+    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     Console *pConsole = pDrv->pVMMDev->getParent();
 
@@ -181 +172 @@
         return;
 
-    guest->setAdditionsStatus(guestStatus->facility, guestStatus->status, guestStatus->flags);
+    guest->setAdditionsStatus((VBoxGuestFacilityType)uFacility, (VBoxGuestFacilityStatus)uStatus, fFlags, pTimeSpecTS);
     pConsole->onAdditionsStateChange();
 }
@@ -237 +228 @@
          *        while holding down the. */
         guest->setAdditionsInfo2(0, "", 0,  0); /* Clear Guest Additions version. */
-        guest->setAdditionsStatus(VBoxGuestFacilityType_All,
-                                  VBoxGuestFacilityStatus_Inactive,
-                                  0); /* Flags; not used. */
+        RTTIMESPEC TimeSpecTS;
+        RTTimeNow(&TimeSpecTS);
+        guest->setAdditionsStatus(VBoxGuestFacilityType_All, VBoxGuestFacilityStatus_Inactive, 0 /*fFlags*/, &TimeSpecTS);
         pConsole->onAdditionsStateChange();
     }