Changeset 22433 in vbox for trunk/src

Timestamp:

Aug 25, 2009 12:20:53 PM (16 years ago)

Author:

vboxsync

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

51425

Message:

VMMDev: fixed handling guests which did not request a display change request with the eventAck field set (yet) -- xtracker 4227

Location:

trunk/src/VBox/Devices/VMMDev

Files:

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

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

@@ -887 +887 @@
                 if (displayChangeRequest->eventAck == VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)
                 {
-                    /* Remember which resolution the client has queried, subsequent reads will return the same values. */
+                    /* Remember which resolution the client has queried, subsequent reads
+                     * will return the same values. */
                     pThis->lastReadDisplayChangeRequest = pThis->displayChangeRequest;
-                }
-
-                /* just pass on the information */
-                displayChangeRequest->xres = pThis->lastReadDisplayChangeRequest.xres;
-                displayChangeRequest->yres = pThis->lastReadDisplayChangeRequest.yres;
-                displayChangeRequest->bpp  = pThis->lastReadDisplayChangeRequest.bpp;
+                    pThis->fGuestSentChangeEventAck = true;
+                }
+
+                if (pThis->fGuestSentChangeEventAck)
+                {
+                    displayChangeRequest->xres = pThis->lastReadDisplayChangeRequest.xres;
+                    displayChangeRequest->yres = pThis->lastReadDisplayChangeRequest.yres;
+                    displayChangeRequest->bpp  = pThis->lastReadDisplayChangeRequest.bpp;
+                }
+                else
+                {
+                    /* This is not a response to a VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, just
+                     * read the last valid video mode hint. This happens when the guest X server
+                     * determines the initial mode. */
+                    displayChangeRequest->xres = pThis->displayChangeRequest.xres;
+                    displayChangeRequest->yres = pThis->displayChangeRequest.yres;
+                    displayChangeRequest->bpp = pThis->displayChangeRequest.bpp;
+                }
                 Log(("VMMDev: returning display change request xres = %d, yres = %d, bpp = %d\n",
                      displayChangeRequest->xres, displayChangeRequest->yres, displayChangeRequest->bpp));
@@ -915 +928 @@
                 if (displayChangeRequest->eventAck == VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)
                 {
-                    /* Remember which resolution the client has queried, subsequent reads will return the same values. */
+                    /* Remember which resolution the client has queried, subsequent reads
+                     * will return the same values. */
                     pThis->lastReadDisplayChangeRequest = pThis->displayChangeRequest;
-                }
-
-                /* just pass on the information */
-                displayChangeRequest->xres    = pThis->lastReadDisplayChangeRequest.xres;
-                displayChangeRequest->yres    = pThis->lastReadDisplayChangeRequest.yres;
-                displayChangeRequest->bpp     = pThis->lastReadDisplayChangeRequest.bpp;
-                displayChangeRequest->display = pThis->lastReadDisplayChangeRequest.display;
+                    pThis->fGuestSentChangeEventAck = true;
+                }
+
+                if (pThis->fGuestSentChangeEventAck)
+                {
+                    displayChangeRequest->xres    = pThis->lastReadDisplayChangeRequest.xres;
+                    displayChangeRequest->yres    = pThis->lastReadDisplayChangeRequest.yres;
+                    displayChangeRequest->bpp     = pThis->lastReadDisplayChangeRequest.bpp;
+                    displayChangeRequest->display = pThis->lastReadDisplayChangeRequest.display;
+                }
+                else
+                {
+                    /* This is not a response to a VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, just
+                     * read the last valid video mode hint. This happens when the guest X server
+                     * determines the initial video mode. */
+                    displayChangeRequest->xres    = pThis->displayChangeRequest.xres;
+                    displayChangeRequest->yres    = pThis->displayChangeRequest.yres;
+                    displayChangeRequest->bpp     = pThis->displayChangeRequest.bpp;
+                    displayChangeRequest->display = pThis->displayChangeRequest.display;
+                }
                 Log(("VMMDev: returning display change request xres = %d, yres = %d, bpp = %d at %d\n",
                      displayChangeRequest->xres, displayChangeRequest->yres, displayChangeRequest->bpp, displayChangeRequest->display));
@@ -2086 +2113 @@
 
 
-#define VMMDEV_SSM_VERSION  10
+#define VMMDEV_SSM_VERSION  11
 
 /**
@@ -2114 +2141 @@
     SSMR3PutU32(pSSMHandle, pThis->fu32AdditionsOk);
     SSMR3PutU32(pSSMHandle, pThis->u32VideoAccelEnabled);
+    SSMR3PutBool(pSSMHandle, pThis->fGuestSentChangeEventAck);
 
     SSMR3PutU32(pSSMHandle, pThis->guestCaps);
@@ -2158 +2186 @@
     SSMR3GetU32(pSSMHandle, &pThis->fu32AdditionsOk);
     SSMR3GetU32(pSSMHandle, &pThis->u32VideoAccelEnabled);
+    if (u32Version > 10)
+        SSMR3GetBool(pSSMHandle, &pThis->fGuestSentChangeEventAck);
 
     SSMR3GetU32(pSSMHandle, &pThis->guestCaps);
@@ -2523 +2553 @@
     /* clear pending display change request. */
     memset (&pThis->lastReadDisplayChangeRequest, 0, sizeof (pThis->lastReadDisplayChangeRequest));
+    pThis->fGuestSentChangeEventAck = false;
 
     /* disable seamless mode */

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

@@ -114 +114 @@
     uint32_t u32VideoAccelEnabled;
 
+    /** true if the guest responded to VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST at least once */
+    bool fGuestSentChangeEventAck;
+
     /** resolution change request */
     struct