Changeset 53528 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 12, 2014 8:22:39 PM (10 years ago)

Author:

vboxsync

Message:

Devices/Graphics, Devices/PC/DevACPI, Main: add support for sending video mode hints through the VGA device.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• DisplayImpl.cpp (modified) (6 diffs)
• GuestImpl.cpp (modified) (1 diff)
• VMMDevInterface.cpp (modified) (1 diff)

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

@@ -5184 +5184 @@
 
     fireVRDEServerInfoChangedEvent(mEventSource);
+}
+
+HRESULT Console::i_sendACPIMonitorHotPlugEvent()
+{
+    LogFlowThisFuncEnter();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (   mMachineState != MachineState_Running
+        && mMachineState != MachineState_Teleporting
+        && mMachineState != MachineState_LiveSnapshotting)
+        return i_setInvalidMachineStateError();
+
+    /* get the VM handle. */
+    SafeVMPtr ptrVM(this);
+    if (!ptrVM.isOk())
+        return ptrVM.rc();
+
+    // no need to release lock, as there are no cross-thread callbacks
+
+    /* get the acpi device interface and press the sleep button. */
+    PPDMIBASE pBase;
+    int vrc = PDMR3QueryDeviceLun(ptrVM.rawUVM(), "acpi", 0, 0, &pBase);
+    if (RT_SUCCESS(vrc))
+    {
+        Assert(pBase);
+        PPDMIACPIPORT pPort = PDMIBASE_QUERY_INTERFACE(pBase, PDMIACPIPORT);
+        if (pPort)
+            vrc = pPort->pfnMonitorHotPlugEvent(pPort);
+        else
+            vrc = VERR_PDM_MISSING_INTERFACE;
+    }
+
+    HRESULT rc = RT_SUCCESS(vrc) ? S_OK :
+        setError(VBOX_E_PDM_ERROR,
+            tr("Sending monitor hot-plug event failed (%Rrc)"),
+            vrc);
+
+    LogFlowThisFunc(("rc=%Rhrc\n", rc));
+    LogFlowThisFuncLeave();
+    return rc;
 }
 

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

@@ -20 +20 @@
 #include "ConsoleImpl.h"
 #include "ConsoleVRDPServer.h"
+#include "GuestImpl.h"
 #include "VMMDev.h"
 
@@ -122 +123 @@
 #ifdef VBOX_WITH_HGSMI
     mu32UpdateVBVAFlags = 0;
+    mfVMMDevSupportsGraphics = false;
+    mfGuestVBVACapabilities = 0;
 #endif
 #ifdef VBOX_WITH_VPX
@@ -1032 +1035 @@
         mParent->i_consoleVRDPServer()->SendUpdateBitmap(uScreenId, x, y, w, h);
     }
+}
+
+void Display::i_updateGuestGraphicsFacility(void)
+{
+    Guest* pGuest = mParent->i_getGuest();
+    AssertPtrReturnVoid(pGuest);
+    /* The following is from GuestImpl.cpp. */
+    /** @todo A nit: The timestamp is wrong on saved state restore. Would be better
+     *  to move the graphics and seamless capability -> facility translation to
+     *  VMMDev so this could be saved.  */
+    RTTIMESPEC TimeSpecTS;
+    RTTimeNow(&TimeSpecTS);
+
+    if (   mfVMMDevSupportsGraphics
+        || (mfGuestVBVACapabilities & VBVACAPS_VIDEO_MODE_HINTS) != 0)
+        pGuest->i_setAdditionsStatus(VBoxGuestFacilityType_Graphics,
+                                     VBoxGuestFacilityStatus_Active,
+                                     0 /*fFlags*/, &TimeSpecTS);
+    else
+        pGuest->i_setAdditionsStatus(VBoxGuestFacilityType_Graphics,
+                                     VBoxGuestFacilityStatus_Inactive,
+                                     0 /*fFlags*/, &TimeSpecTS);
+}
+
+void Display::i_handleUpdateVMMDevSupportsGraphics(bool fSupportsGraphics)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    if (mfVMMDevSupportsGraphics == fSupportsGraphics)
+        return;
+    mfVMMDevSupportsGraphics = fSupportsGraphics;
+    i_updateGuestGraphicsFacility();
+    /* The VMMDev interface notifies the console. */
+}
+
+void Display::i_handleUpdateGuestVBVACapabilities(uint32_t fNewCapabilities)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    bool fNotify = (fNewCapabilities & VBVACAPS_VIDEO_MODE_HINTS) != 0;
+
+    mfGuestVBVACapabilities = fNewCapabilities;
+    if (!fNotify)
+        return;
+    i_updateGuestGraphicsFacility();
+    /* Tell the console about it */
+    mParent->i_onAdditionsStateChange();
 }
 
@@ -1637 +1685 @@
     alock.release();
 
+    /* We always send the hint to the graphics card in case the guest enables
+     * support later.  For now we notify exactly when support is enabled. */
+    mpDrv->pUpPort->pfnSendModeHint(mpDrv->pUpPort, aWidth, aHeight,
+                                    aBitsPerPixel, aDisplay,
+                                    aChangeOrigin ? aOriginX : ~0,
+                                    aChangeOrigin ? aOriginY : ~0,
+                                    RT_BOOL(aEnabled),
+                                      mfGuestVBVACapabilities
+                                    & VBVACAPS_VIDEO_MODE_HINTS);
+    if (   mfGuestVBVACapabilities & VBVACAPS_VIDEO_MODE_HINTS
+        && !(mfGuestVBVACapabilities & VBVACAPS_IRQ))
+    {
+        HRESULT hrc = mParent->i_sendACPIMonitorHotPlugEvent();
+        if (FAILED(hrc))
+            return hrc;
+    }
+
+    /* We currently never suppress the VMMDev hint if the guest has requested
+     * it.  Specifically the video graphics driver may not be responsible for
+     * screen positioning in the guest virtual desktop, and the component
+     * responsible may want to get the hint from VMMDev. */
     VMMDev *pVMMDev = mParent->i_getVMMDev();
     if (pVMMDev)
@@ -3781 +3850 @@
     return VINF_SUCCESS;
 }
+
+DECLCALLBACK(void) Display::i_displayVBVAGuestCapabilityUpdate(PPDMIDISPLAYCONNECTOR pInterface, uint32_t fCapabilities)
+{
+    LogFlowFunc(("\n"));
+
+    PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
+    Display *pThis = pDrv->pDisplay;
+
+    pThis->i_handleUpdateGuestVBVACapabilities(fCapabilities);
+}
 #endif /* VBOX_WITH_HGSMI */
 
@@ -3881 +3960 @@
     pThis->IConnector.pfnVBVAResize            = Display::i_displayVBVAResize;
     pThis->IConnector.pfnVBVAMousePointerShape = Display::i_displayVBVAMousePointerShape;
+    pThis->IConnector.pfnVBVAGuestCapabilityUpdate = Display::i_displayVBVAGuestCapabilityUpdate;
 #endif
 

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

@@ -1083 +1083 @@
                      0 /*fFlags*/, &TimeSpecTS);
     /** @todo Add VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING */
-    i_facilityUpdate(VBoxGuestFacilityType_Graphics,
-                     aCaps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? VBoxGuestFacilityStatus_Active : VBoxGuestFacilityStatus_Inactive,
-                     0 /*fFlags*/, &TimeSpecTS);
-}
-
+}
+

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

@@ -290 +290 @@
      */
     pGuest->i_setSupportedFeatures(newCapabilities);
+
+    /*
+     * Tell the Display, so that it can update the "supports graphics"
+     * capability if the graphics card has not asserted it.
+     */
+    Display* pDisplay = pConsole->i_getDisplay();
+    AssertPtrReturnVoid(pDisplay);
+    pDisplay->i_handleUpdateVMMDevSupportsGraphics(newCapabilities
+                                             & VMMDEV_GUEST_SUPPORTS_GRAPHICS);
 
     /*