Changeset 78995 in vbox

Timestamp:

Jun 5, 2019 1:30:45 PM (6 years ago)

Author:

vboxsync

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

131127

Message:

PDM, Devices, FE, Main: allow size hints without notification for initial hints.
bugref:9482: FE/Qt and Additions/WINNT: move away from -adjust size if...-
This change allows size hints/monitor information to be set in a machine
without generating an IRQ notification, for the purpose of setting the
initial monitor information. It also uses the function for that purpose.

Location:

trunk

Files:

• include/VBox/vmm/pdmifs.h (modified) (2 diffs)
• src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (4 diffs)
• src/VBox/Main/include/DisplayImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleVRDPServer.cpp (modified) (1 diff)
• src/VBox/Main/src-client/DisplayImpl.cpp (modified) (4 diffs)

trunk/include/VBox/vmm/pdmifs.h

@@ -1528 +1528 @@
      * @param   fForce          Whether to deliver the request to the guest even if the guest has
      *                          the requested resolution already.
+     * @param   fMayNotify      Whether to send a hotplug notification to the guest if appropriate.
      */
     DECLR3CALLBACKMEMBER(int, pfnRequestDisplayChange,(PPDMIVMMDEVPORT pInterface, uint32_t cDisplays,
-                                                       struct VMMDevDisplayDef const *paDisplays, bool fForce));
+                                                       struct VMMDevDisplayDef const *paDisplays, bool fForce, bool fMayNotify));
 
     /**
@@ -1628 +1629 @@
 } PDMIVMMDEVPORT;
 /** PDMIVMMDEVPORT interface ID. */
-#define PDMIVMMDEVPORT_IID                      "2ccc19a5-742a-4af0-a7d3-31ea67ff50e9"
+#define PDMIVMMDEVPORT_IID                      "9e004f1a-875d-11e9-a673-c77c30f53623"
 
 

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

@@ -3570 +3570 @@
  */
 static DECLCALLBACK(int)
-vmmdevIPort_RequestDisplayChange(PPDMIVMMDEVPORT pInterface, uint32_t cDisplays, VMMDevDisplayDef const *paDisplays, bool fForce)
+vmmdevIPort_RequestDisplayChange(PPDMIVMMDEVPORT pInterface, uint32_t cDisplays, VMMDevDisplayDef const *paDisplays, bool fForce, bool fMayNotify)
 {
     int rc = VINF_SUCCESS;
@@ -3604 +3604 @@
         /* We could validate the information here but hey, the guest can do that as well! */
         pRequest->displayChangeRequest = *p;
-        pRequest->fPending = fDifferentResolution;
+        pRequest->fPending = fDifferentResolution && fMayNotify;
 
         fNotifyGuest = fNotifyGuest || fDifferentResolution;
     }
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc) && fMayNotify)
     {
         if (fNotifyGuest)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -1439 +1439 @@
             CHECK_ERROR_BREAK(pDisplay, SetVideoModeHint(uDisplayIdx, fEnabled,
                                                          fChangeOrigin, iOriginX, iOriginY,
-                                                         uXRes, uYRes, uBpp));
+                                                         uXRes, uYRes, uBpp, true));
         }
         else if (!strcmp(a->argv[1], "setscreenlayout"))

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -2824 +2824 @@
                 gpDisplay->SetVideoModeHint(0 /*=display*/, true /*=enabled*/, false /*=changeOrigin*/,
                                             0 /*=originX*/, 0 /*=originY*/,
-                                            uResizeWidth, uResizeHeight, 0 /*=don't change bpp*/);
+                                            uResizeWidth, uResizeHeight, 0 /*=don't change bpp*/, true /*=notify*/);
                 break;
 
@@ -5225 +5225 @@
             gpDisplay->SetVideoModeHint(0 /*=display*/, true /*=enabled*/,
                                         false /*=changeOrigin*/, 0 /*=originX*/, 0 /*=originY*/,
-                                        NewWidth, NewHeight, 0 /*don't change bpp*/);
+                                        NewWidth, NewHeight, 0 /*don't change bpp*/, true /*=notify*/);
         }
     }

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

@@ -316 +316 @@
                 display().SetVideoModeHint(screenId(),
                                            uisession()->isScreenVisible(screenId()),
-                                           false, 0, 0, size.width(), size.height(), 0);
+                                           false, 0, 0, size.width(), size.height(), 0, true);
             /* If host desires to have guest-screen disabled and guest-screen is enabled, retrying: */
             else if (!uisession()->isScreenVisibleHostDesires(screenId()))
-                display().SetVideoModeHint(screenId(), false, false, 0, 0, 0, 0, 0);
+                display().SetVideoModeHint(screenId(), false, false, 0, 0, 0, 0, 0, true);
             /* If host desires to have guest-screen enabled and guest-screen is disabled, retrying: */
             else if (uisession()->isScreenVisibleHostDesires(screenId()))
-                display().SetVideoModeHint(screenId(), true, false, 0, 0, size.width(), size.height(), 0);
+                display().SetVideoModeHint(screenId(), true, false, 0, 0, size.width(), size.height(), 0, true);
         }
     }
@@ -332 +332 @@
             display().SetVideoModeHint(screenId(),
                                        uisession()->isScreenVisible(screenId()),
-                                       false, 0, 0, size.width(), size.height(), 0);
+                                       false, 0, 0, size.width(), size.height(), 0, true);
     }
 }

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

@@ -129 +129 @@
             LogRel(("GUI: UIMultiScreenLayout::update: Disabling excessive guest-screen %d\n", iGuestScreen));
             m_pMachineLogic->uisession()->setScreenVisibleHostDesires(iGuestScreen, false);
-            m_pMachineLogic->display().SetVideoModeHint(iGuestScreen, false, false, 0, 0, 0, 0, 0);
+            m_pMachineLogic->display().SetVideoModeHint(iGuestScreen, false, false, 0, 0, 0, 0, 0, true);
         }
     }
@@ -163 +163 @@
                     iGuestScreen, uWidth, uHeight));
             m_pMachineLogic->uisession()->setScreenVisibleHostDesires(iGuestScreen, true);
-            m_pMachineLogic->display().SetVideoModeHint(iGuestScreen, true, false, 0, 0, uWidth, uHeight, 32);
+            m_pMachineLogic->display().SetVideoModeHint(iGuestScreen, true, false, 0, 0, uWidth, uHeight, 32, true);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -225 +225 @@
     {
         uisession()->setScreenVisibleHostDesires(iIndex, false);
-        display().SetVideoModeHint(iIndex, false, false, 0, 0, 0, 0, 0);
+        display().SetVideoModeHint(iIndex, false, false, 0, 0, 0, 0, 0, true);
     }
     else
@@ -235 +235 @@
             uHeight = 600;
         uisession()->setScreenVisibleHostDesires(iIndex, true);
-        display().SetVideoModeHint(iIndex, true, false, 0, 0, uWidth, uHeight, 32);
+        display().SetVideoModeHint(iIndex, true, false, 0, 0, uWidth, uHeight, 32, true);
     }
 }
@@ -243 +243 @@
     /* Resize guest to required size: */
     display().SetVideoModeHint(iIndex, uisession()->isScreenVisible(iIndex),
-                             false, 0, 0, size.width(), size.height(), 0);
+                             false, 0, 0, size.width(), size.height(), 0, true);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -166 +166 @@
     m_sizeHintOverride = QSize(800, 600).expandedTo(sizeHint);
 
-    /* Send saved size-hint to the guest: */
-    /// @todo What if not m_bIsGuestAutoresizeEnabled?
-    ///       Just let the guest start at the default 800x600?
+    /* Restore saved monitor information to the guest.  The guest may not respond
+     * until a suitable driver or helper is enabled (or at all).  We do not notify
+     * the guest (aNotify == false), because there is technically no change (same
+     * hardware as before shutdown), and notifying would interfere with the Windows
+     * guest driver which saves the video mode to the registry on shutdown. */
     uisession()->setScreenVisibleHostDesires(screenId(), guestScreenVisibilityStatus());
     display().SetVideoModeHint(screenId(),
                                guestScreenVisibilityStatus(),
-                               false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
+                               false, 0, 0, sizeHint.width(), sizeHint.height(), 0, false);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -177 +177 @@
     display().SetVideoModeHint(screenId(),
                                guestScreenVisibilityStatus(),
-                               false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
+                               false, 0, 0, sizeHint.width(), sizeHint.height(), 0, true);
 }
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -18381 +18381 @@
   <enum
     name="ScreenLayoutMode"
-    uuid="c7a9ee66-cfed-438b-9f8c-d3adf7588a4d"
+    uuid="8fa1964c-8774-11e9-ae5d-1f419105e68d"
     wsmap="managed"
     >
@@ -18403 +18403 @@
       <desc>
         Attach new screens and always set the new mode for existing screens.
+      </desc>
+    </const>
+
+    <const name="Silent" value="3">
+      <desc>
+        Do not notify the guest of the change.  Normally this is wished, but it
+        might not be when re-setting monitor information from the last session
+        (no hotplug happened, as it is still the same virtual monitor).
       </desc>
     </const>
@@ -18426 +18434 @@
   <interface
     name="IDisplay" extends="$unknown"
-    uuid="ab4164db-c13e-4dab-842d-61ee3f0c1e87"
+    uuid="4680b2de-8690-11e9-b83d-5719e53cf1de"
     wsmap="managed"
     wrap-hint-server-addinterfaces="IEventListener"
@@ -18558 +18566 @@
         <desc>
           The number of bits per pixel of the guest screen.
+        </desc>
+      </param>
+      <param name="notify" type="boolean" dir="in">
+        <desc>
+          Whether the guest should be notified of the change.  Normally this
+          is wished, but it might not be when re-setting monitor information
+          from the last session (no hotplug happened, as it is still the same
+          virtual monitor).  Might also be useful if several monitors are to be
+          changed at once, but this would not reflect physical hardware well,
+          and we also have @a setScreenLayout for that.
         </desc>
       </param>

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -260 +260 @@
                                      ULONG aWidth,
                                      ULONG aHeight,
-                                     ULONG aBitsPerPixel);
+                                     ULONG aBitsPerPixel,
+                                     BOOL aNotify);
     virtual HRESULT getVideoModeHint(ULONG aDisplay,
                                      BOOL *aEnabled,

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

@@ -1294 +1294 @@
     server->mConsole->i_getDisplay()->SetVideoModeHint(uScreenId, TRUE /*=enabled*/,
                                                        FALSE /*=changeOrigin*/, 0/*=OriginX*/, 0/*=OriginY*/,
-                                                       cWidth, cHeight, cBitsPerPixel);
+                                                       cWidth, cHeight, cBitsPerPixel, TRUE /*=notify*/);
 }
 

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

@@ -1949 +1949 @@
 HRESULT Display::setVideoModeHint(ULONG aDisplay, BOOL aEnabled,
                                   BOOL aChangeOrigin, LONG aOriginX, LONG aOriginY,
-                                  ULONG aWidth, ULONG aHeight, ULONG aBitsPerPixel)
+                                  ULONG aWidth, ULONG aHeight, ULONG aBitsPerPixel,
+                                  BOOL aNotify)
 {
     if (aWidth == 0 || aHeight == 0 || aBitsPerPixel == 0)
@@ -2011 +2012 @@
                                     aChangeOrigin ? aOriginY : ~0,
                                     RT_BOOL(aEnabled),
-                                      mfGuestVBVACapabilities
-                                    & VBVACAPS_VIDEO_MODE_HINTS);
+                                       (  mfGuestVBVACapabilities
+                                        & VBVACAPS_VIDEO_MODE_HINTS)
+                                    && aNotify);
     if (   mfGuestVBVACapabilities & VBVACAPS_VIDEO_MODE_HINTS
-        && !(mfGuestVBVACapabilities & VBVACAPS_IRQ))
+        && !(mfGuestVBVACapabilities & VBVACAPS_IRQ)
+        && aNotify)
     {
         mParent->i_sendACPIMonitorHotPlugEvent();
@@ -2028 +2031 @@
         PPDMIVMMDEVPORT pVMMDevPort = pVMMDev->getVMMDevPort();
         if (pVMMDevPort)
-            pVMMDevPort->pfnRequestDisplayChange(pVMMDevPort, 1, &d, false);
+            pVMMDevPort->pfnRequestDisplayChange(pVMMDevPort, 1, &d, false, aNotify);
     }
     /* Notify listeners. */
@@ -3082 +3085 @@
                 bool const fForce =    aScreenLayoutMode == ScreenLayoutMode_Reset
                                     || aScreenLayoutMode == ScreenLayoutMode_Apply;
-                pVMMDevPort->pfnRequestDisplayChange(pVMMDevPort, cDisplays, paDisplayDefs, fForce);
+                bool const fNotify = aScreenLayoutMode != ScreenLayoutMode_Silent;
+                pVMMDevPort->pfnRequestDisplayChange(pVMMDevPort, cDisplays, paDisplayDefs, fForce, fNotify);
 
                 RTMemFree(paDisplayDefs);