Changeset 76164 in vbox

Timestamp:

Dec 11, 2018 4:14:25 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: for guests using VMSVGA, do not remember guest-initiated resizes.
bugref:5329: Implement VMWare SVGA compatible video device
Currently we remember the last size set by the guest operating system to the
virtual display hardware before it was shut down and resend it on next start-
up. This is similar to having the same monitor plugged into a physical
system next time it is started. However, Linux guests using VMSVGA always
set the size to 800x600 with one screen on shut-down, which is not what we
want to remember. So for guests with the VMSVGA graphics controller type
(normally only used for Linux guests) we only remember sizes which we
explicitly send ourselves, as of this change, to get around this.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• runtime/UIMachineView.cpp (modified) (2 diffs)
• runtime/UISession.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -3709 +3709 @@
 {
     /* Not for primary screen: */
-    AssertReturn(uScreenIndex > 0, true);
+    if (uScreenIndex == 0)
+        return true;
 
     /* Compose corresponding key: */
@@ -3721 +3722 @@
 {
     /* Not for primary screen: */
-    AssertReturnVoid(uScreenIndex > 0);
+    if (uScreenIndex == 0)
+        return;
 
     /* Compose corresponding key: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -319 +319 @@
             (int)screenId(), size.width(), size.height()));
 
+    /* Record the hint to extra data, needed for guests using VMSVGA: */
+    storeGuestSizeHint(size);
+
     /* If auto-mount of guest-screens (auto-pilot) enabled: */
     if (gEDataManager->autoMountGuestScreensEnabled(vboxGlobal().managedVMUuid()))
@@ -434 +437 @@
     /* If we are in normal or scaled mode and if GA are active,
      * remember the guest-screen size to be able to restore it when necessary: */
-    if (!isFullscreenOrSeamless() && uisession()->isGuestSupportsGraphics())
+    /* As machines with Linux/Solaris and VMSVGA are not able to tell us
+     * whether a resize was due to the system or user interaction we currently
+     * do not store hints for these systems except when we explicitly send them
+     * ourselves.  Windows guests should use VBoxVGA controllers, not VMSVGA. */
+    if (   !isFullscreenOrSeamless()
+        && uisession()->isGuestSupportsGraphics()
+        && (machine().GetGraphicsControllerType() != KGraphicsControllerType_VMSVGA))
         storeGuestSizeHint(QSize(iWidth, iHeight));
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -2061 +2061 @@
     /* Remember 'actual' (host-desire) visibility status: */
     m_monitorVisibilityVectorHostDesires[(int)uScreenId] = fIsMonitorVisible;
+
+    /* And remember the request in extra data for guests with VMSVGA: */
+    gEDataManager->setLastGuestScreenVisibilityStatus(uScreenId, fIsMonitorVisible, vboxGlobal().managedVMUuid());
 }
 
@@ -2080 +2083 @@
     m_monitorVisibilityVector[(int)uScreenId] = fIsMonitorVisible;
     /* Remember 'desired' visibility status: */
-    gEDataManager->setLastGuestScreenVisibilityStatus(uScreenId, fIsMonitorVisible, vboxGlobal().managedVMUuid());
+    /* See note in UIMachineView::sltHandleNotifyChange() regarding the graphics controller check. */
+    if (machine().GetGraphicsControllerType() != KGraphicsControllerType_VMSVGA)
+        gEDataManager->setLastGuestScreenVisibilityStatus(uScreenId, fIsMonitorVisible, vboxGlobal().managedVMUuid());
 
     /* Make sure action-pool knows guest-screen visibility status: */