- Timestamp:
- Feb 11, 2015 9:08:20 PM (10 years ago)
- svn:sync-xref-src-repo-rev:
- 98203
- Location:
- trunk/src/VBox
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp
r53965 r54162 2636 2636 pCtx->aModeHints[iDisplay].dy = dy; 2637 2637 pCtx->aModeHints[iDisplay].fEnabled = fEnabled; 2638 if (fNotifyGuest && pThis->fGuestCaps & VBVACAPS_IRQ )2638 if (fNotifyGuest && pThis->fGuestCaps & VBVACAPS_IRQ && pThis->fGuestCaps & VBVACAPS_VIDEO_MODE_HINTS) 2639 2639 VBVARaiseIrq(pThis, HGSMIHOSTFLAGS_HOTPLUG); 2640 2640 return VINF_SUCCESS; … … 2670 2670 pThis->fHostCursorCapabilities |= fCapabilitiesAdded; 2671 2671 pThis->fHostCursorCapabilities &= ~fCapabilitiesRemoved; 2672 if (pThis->fGuestCaps & VBVACAPS_IRQ )2672 if (pThis->fGuestCaps & VBVACAPS_IRQ && pThis->fGuestCaps & VBVACAPS_DISABLE_CURSOR_INTEGRATION) 2673 2673 VBVARaiseIrqNoWait(pThis, HGSMIHOSTFLAGS_CURSOR_CAPABILITIES); 2674 2674 PDMCritSectLeave(&pThis->CritSect); -
trunk/src/VBox/Main/src-client/DisplayImpl.cpp
r54114 r54162 1183 1183 if (!ptrVM.isOk()) 1184 1184 return ptrVM.rc(); 1185 if (mfHostCursorCapabilities == fHostCursorCapabilities) 1186 return S_OK; 1185 1187 CHECK_CONSOLE_DRV(mpDrv); 1186 1188 alock.release(); /* Release before calling up for lock order reasons. */ 1187 1189 mpDrv->pUpPort->pfnReportHostCursorCapabilities (mpDrv->pUpPort, fCapabilitiesAdded, fCapabilitiesRemoved); 1188 1190 if ( mfGuestVBVACapabilities & VBVACAPS_DISABLE_CURSOR_INTEGRATION 1189 && !(mfGuestVBVACapabilities & VBVACAPS_IRQ) 1190 && fHostCursorCapabilities != mfHostCursorCapabilities) 1191 && !(mfGuestVBVACapabilities & VBVACAPS_IRQ)) 1191 1192 { 1192 1193 HRESULT hrc = mParent->i_sendACPIMonitorHotPlugEvent();
Note:
See TracChangeset
for help on using the changeset viewer.