Changeset 60465 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Apr 12, 2016 6:42:22 PM (9 years ago)

Author:

vboxsync

Message:

DevVGA: set IRQs only if the VM is running (bugref:8320)

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (3 diffs)
• DevVGA.h (modified) (1 diff)
• DevVGA_VBVA.cpp (modified) (2 diffs)
• HGSMI/HGSMIHost.cpp (modified) (1 diff)
• HGSMI/HGSMIHost.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -6985 +6985 @@
 }
 
+static DECLCALLBACK(void) vgaR3PowerOn(PPDMDEVINS pDevIns)
+{
+    PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
+    vmsvgaR3PowerOn(pDevIns);
+    VBVAOnResume(pThis);
+}
+
+static DECLCALLBACK(void) vgaR3Resume(PPDMDEVINS pDevIns)
+{
+    PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
+    VBVAOnResume(pThis);
+}
 
 /**
@@ -7019 +7031 @@
     /* pfnPowerOn */
 #ifdef VBOX_WITH_VMSVGA
-    vmsvgaR3PowerOn,
+    vgaR3PowerOn,
 #else
     NULL,
@@ -7028 +7040 @@
     NULL,
     /* pfnResume */
-    NULL,
+    vgaR3Resume,
     /* pfnAttach */
     vgaAttach,

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -683 +683 @@
 void     VBVAPause (PVGASTATE pVGAState, bool fPause);
 void     VBVAOnVBEChanged(PVGASTATE pVGAState);
+void     VBVAOnResume(PVGASTATE pThis);
 
 bool VBVAIsPaused(PVGASTATE pVGAState);

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -2086 +2086 @@
     PDMCritSectLeave(&pVGAState->CritSect);
 
-    PDMDevHlpPCISetIrq(pDevIns, 0, PDM_IRQ_LEVEL_HIGH);
+    /* Set IRQ only for a running VM.
+     * If HGSMIHOSTFLAGS_IRQ is set, then vgaR3Resume/vgaR3PowerOn will
+     * set the postponed IRQ.
+     */
+    VMSTATE enmVMState = PDMDevHlpVMState(pDevIns);
+    if (   enmVMState == VMSTATE_RUNNING
+        || enmVMState == VMSTATE_RUNNING_LS)
+    {
+        PDMDevHlpPCISetIrq(pDevIns, 0, PDM_IRQ_LEVEL_HIGH);
+    }
 }
 
@@ -2103 +2112 @@
      * 3. IRQ is set */
     VMR3ReqCallNoWait(PDMDevHlpGetVM(pVGAState->pDevInsR3), VMCPUID_ANY, (PFNRT)vbvaRaiseIrqEMT, 2, pVGAState, fFlags);
+}
+
+void VBVAOnResume(PVGASTATE pThis)
+{
+    PPDMDEVINS pDevIns = pThis->pDevInsR3;
+
+    PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    bool fIrq = RT_BOOL(HGSMIGetHostGuestFlags(pThis->pHGSMI) & HGSMIHOSTFLAGS_IRQ);
+    PDMCritSectLeave(&pThis->CritSect);
+
+    if (fIrq)
+        PDMDevHlpPCISetIrq(pDevIns, 0, PDM_IRQ_LEVEL_HIGH);
 }
 

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -474 +474 @@
     AssertPtrReturnVoid(pIns->pHGFlags);
     ASMAtomicOrU32(&pIns->pHGFlags->u32HostFlags, flags);
+}
+
+uint32_t HGSMIGetHostGuestFlags(HGSMIINSTANCE *pIns)
+{
+    return pIns->pHGFlags? ASMAtomicReadU32(&pIns->pHGFlags->u32HostFlags) : 0;
 }
 

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h

@@ -92 +92 @@
 
 void HGSMISetHostGuestFlags(PHGSMIINSTANCE pIns, uint32_t flags);
+uint32_t HGSMIGetHostGuestFlags(HGSMIINSTANCE *pIns);
 
 void HGSMIClearHostGuestFlags(PHGSMIINSTANCE pIns, uint32_t flags);