Changeset 75875 in vbox

Timestamp:

Dec 2, 2018 5:04:57 PM (6 years ago)

Author:

vboxsync

Message:

GuestControl,VMMDev: Fixed VERR_VM_RESTORED scenario. VMMDev didn't signal interrupts during restore and the service returned a truncated VMMDevSessionId value. bugref:9313

Location:

trunk/src/VBox

Files:

• Devices/VMMDev/VMMDev.cpp (modified) (2 diffs)
• HostServices/GuestControl/service.cpp (modified) (1 diff)

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

@@ -360 +360 @@
      */
     VMSTATE enmVMState = PDMDevHlpVMState(pThis->pDevInsR3);
-/** @todo r=bird: Shouldn't there be more states here?  Wouldn't we drop
- *        notifications now when we're in the process of suspending or
- *        similar? */
     if (   enmVMState == VMSTATE_RUNNING
-        || enmVMState == VMSTATE_RUNNING_LS)
+        || enmVMState == VMSTATE_RUNNING_LS
+        || enmVMState == VMSTATE_LOADING
+        || enmVMState == VMSTATE_RESUMING
+        || enmVMState == VMSTATE_SUSPENDING
+        || enmVMState == VMSTATE_SUSPENDING_LS
+        || enmVMState == VMSTATE_SUSPENDING_EXT_LS
+        || enmVMState == VMSTATE_DEBUGGING
+        || enmVMState == VMSTATE_DEBUGGING_LS
+       )
     {
         PDMCritSectEnter(&pThis->CritSect, VERR_IGNORED);
@@ -370 +375 @@
         PDMCritSectLeave(&pThis->CritSect);
     }
+    else
+        LogRel(("VMMDevNotifyGuest: fAddEvents=%#x ignored because enmVMState=%d\n", fAddEvents, enmVMState));
 }
 

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

@@ -1185 +1185 @@
         if (idRestoreCheck != idRestore)
         {
-            paParms[0].u.uint32 = idRestore;
+            paParms[0].u.uint64 = idRestore;
             LogFlowFunc(("[Client %RU32] GUEST_MSG_PEEK_XXXX -> VERR_VM_RESTORED (%#RX64 -> %#RX64)\n",
                          pClient->m_idClient, idRestoreCheck, idRestore));