Changeset 332 in vbox for trunk

Timestamp:

Jan 25, 2007 8:49:05 PM (18 years ago)

Author:

vboxsync

Message:

introduced PDMDevHlpGetVM()

Location:

trunk

Files:

• include/VBox/pdm.h (modified) (1 diff)
• src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (4 diffs)
• src/VBox/Devices/Bus/DevPCI.cpp (modified) (1 diff)
• src/VBox/Devices/Graphics/DevVGA.cpp (modified) (5 diffs)
• src/VBox/Devices/Network/DevPCNet.cpp (modified) (5 diffs)
• src/VBox/Devices/PC/DevPcBios.cpp (modified) (4 diffs)
• src/VBox/Devices/Storage/DevATA.cpp (modified) (9 diffs)
• src/VBox/Devices/VMMDev/VBoxDev.cpp (modified) (4 diffs)

trunk/include/VBox/pdm.h

@@ -5689 +5689 @@
 
 /**
+ * @copydoc PDMDEVHLP::pfnGetVM
+ */
+DECLINLINE(PVM) PDMDevHlpGetVM(PPDMDEVINS pDevIns)
+{
+    return pDevIns->pDevHlp->pfnGetVM(pDevIns);
+}
+
+/**
  * @copydoc PDMDEVHLP::pfnPhysReadGCVirt
  */

trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

@@ -40 +40 @@
 
 #undef LOG_VOICES
+//#define USE_MIXER
 
 #define AC97_SSM_VERSION 1
@@ -580 +581 @@
 #ifdef USE_MIXER
     record_select (s, 0);
-    set_volume (s, AC97_Master_Volume_Mute, AUD_MIXER_VOLUME  , 0x8000);
-    set_volume (s, AC97_PCM_Out_Volume_Mute, AUD_MIXER_PCM    , 0x8808);
+    set_volume (s, AC97_Master_Volume_Mute,  AUD_MIXER_VOLUME,  0x8000);
+    set_volume (s, AC97_PCM_Out_Volume_Mute, AUD_MIXER_PCM,     0x8808);
     set_volume (s, AC97_Line_In_Volume_Mute, AUD_MIXER_LINE_IN, 0x8808);
 #else
@@ -1473 +1474 @@
     record_select (s, mixer_load (s, AC97_Record_Select));
 #define V_(a, b) set_volume (s, a, b, mixer_load (s, a))
-    V_ (AC97_Master_Volume_Mute, AUD_MIXER_VOLUME);
+    V_ (AC97_Master_Volume_Mute,  AUD_MIXER_VOLUME);
     V_ (AC97_PCM_Out_Volume_Mute, AUD_MIXER_PCM);
     V_ (AC97_Line_In_Volume_Mute, AUD_MIXER_LINE_IN);
@@ -1667 +1668 @@
     /** @todo r=bird: add a devhlp for this of course! */
     if (!pData->ac97.voice_pi || !pData->ac97.voice_po || !pData->ac97.voice_mc)
-        VMSetRuntimeError(pDevIns->pDevHlp->pfnGetVM(pDevIns), false,
+        VMSetRuntimeError(PDMDevHlpGetVM(pDevIns), false,
                           N_("Some audio devices could not be opened. Guest applications "
                              "generating audio output or depending on audio input may hang. "

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -1312 +1312 @@
     PPCIGLOBALS pGlobals = DEVINS2PCIGLOBALS(pDevIns);
     PPCIBUS     pBus = PDMINS2DATA(pDevIns, PPCIBUS);
-    PVM         pVM = pDevIns->pDevHlp->pfnGetVM(pDevIns);
+    PVM         pVM = PDMDevHlpGetVM(pDevIns);
     Assert(pVM);
 

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

@@ -3634 +3634 @@
     {
         PPDMDEVINS pDevIns = pData->pDevInsHC;
-        PGMHandlerPhysicalReset(pDevIns->pDevHlp->pfnGetVM(pDevIns), pData->GCPhysVRAM);
+        PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pData->GCPhysVRAM);
         pData->fHaveDirtyBits = false;
     }
@@ -4038 +4038 @@
     Assert(pDevIns);
 
-    pVM = pDevIns->pDevHlp->pfnGetVM(pDevIns);
+    pVM = PDMDevHlpGetVM(pDevIns);
     Assert(pVM);
 
@@ -4134 +4134 @@
          * already registered before trying to do that all over again.
          */
-        PVM pVM = pPciDev->pDevIns->pDevHlp->pfnGetVM(pPciDev->pDevIns);
+        PVM pVM = PDMDevHlpGetVM(pPciDev->pDevIns);
         if (pData->GCPhysVRAM)
         {
@@ -4353 +4353 @@
         &&  pData->GCPhysVRAM)
     {
-        int rc = PGMHandlerPhysicalReset(pDevIns->pDevHlp->pfnGetVM(pDevIns), pData->GCPhysVRAM);
+        int rc = PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pData->GCPhysVRAM);
         AssertRC(rc);
     }
@@ -4504 +4504 @@
     unsigned i;
     PVGASTATE   pData = PDMINS2DATA(pDevIns, PVGASTATE);
-    PVM         pVM = pDevIns->pDevHlp->pfnGetVM(pDevIns);
+    PVM         pVM = PDMDevHlpGetVM(pDevIns);
 #ifdef VBE_NEW_DYN_LIST
     uint32_t    cCustomModes;

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -1200 +1200 @@
 #if 0
     if (pData->RDRAPhysOld != 0 && pData->GCRDRA != pData->RDRAPhysOld)
-        PGMHandlerPhysicalDeregister(pDevIns->pDevHlp->pfnGetVM(pDevIns),
+        PGMHandlerPhysicalDeregister(PDMDevHlpGetVM(pDevIns),
                                      pData->RDRAPhysOld & ~PAGE_OFFSET_MASK);
     if (   pData->TRDAPhysOld != 0 && pData->GCTDRA != pData->TRDAPhysOld
@@ -1209 +1209 @@
     {
         int rc;
-        rc = PGMR3HandlerPhysicalRegister(pDevIns->pDevHlp->pfnGetVM(pDevIns),
+        rc = PGMR3HandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns),
                                           PGMPHYSHANDLERTYPE_PHYSICAL_WRITE,
                                           pData->GCRDRA & ~PAGE_OFFSET_MASK,
@@ -1228 +1228 @@
     {
         if (pData->TRDAPhysOld != 0)
-            PGMHandlerPhysicalDeregister(pDevIns->pDevHlp->pfnGetVM(pDevIns),
+            PGMHandlerPhysicalDeregister(PDMDevHlpVM(pDevIns),
                                          pData->TRDAPhysOld & ~PAGE_OFFSET_MASK);
 
         int rc;
 
-        rc = PGMR3HandlerPhysicalRegister(pDevIns->pDevHlp->pfnGetVM(pDevIns),
+        rc = PGMR3HandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns),
                                           PGMPHYSHANDLERTYPE_PHYSICAL_WRITE,
                                           pData->GCTDRA & ~PAGE_OFFSET_MASK,
@@ -3942 +3942 @@
 
 #ifdef PCNET_NO_POLLING
-    rc = PDMR3GetSymbolR0Lazy(pDevIns->pDevHlp->pfnGetVM(pDevIns), NULL, "EMInterpretInstruction", (void **)&pData->pfnEMInterpretInstructionR0);
+    rc = PDMR3GetSymbolR0Lazy(PDMDevHlpGetVM(pDevIns), NULL, "EMInterpretInstruction", (void **)&pData->pfnEMInterpretInstructionR0);
     if (VBOX_SUCCESS(rc))
     {
@@ -3949 +3949 @@
          */
         RTGCPTR pfnHandlerGC;
-        rc = PDMR3GetSymbolGCLazy(pDevIns->pDevHlp->pfnGetVM(pDevIns), NULL, "EMInterpretInstruction", (RTGCPTR *)&pData->pfnEMInterpretInstructionGC);
+        rc = PDMR3GetSymbolGCLazy(PDMDevHlpGetVM(pDevIns), NULL, "EMInterpretInstruction", (RTGCPTR *)&pData->pfnEMInterpretInstructionGC);
     }
     if (VBOX_FAILURE(rc))

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -195 +195 @@
     AssertRC(rc);
 #else
-    PVM pVM = pDevIns->pDevHlp->pfnGetVM(pDevIns);
+    PVM pVM = PDMDevHlpGetVM(pDevIns);
     IOMIOPortWrite(pVM, 0x70, off, 1);
     IOMIOPortWrite(pVM, 0x71, u32Val, 1);
@@ -276 +276 @@
     uint32_t        u32;
     unsigned        i;
-    PVM             pVM = pDevIns->pDevHlp->pfnGetVM(pDevIns);
+    PVM             pVM = PDMDevHlpGetVM(pDevIns);
     PPDMIBLOCKBIOS  apHDs[4] = {0};
     PPDMIBLOCKBIOS  apFDs[2] = {0};
@@ -533 +533 @@
             {
 #if 0
-                PVM pVM = pDevIns->pDevHlp->pfnGetVM(pDevIns);
+                PVM pVM = PDMDevHlpGetVM(pDevIns);
                 AssertRelease(pVM);
                 VM_FF_SET(pVM, VM_FF_TERMINATE);
@@ -659 +659 @@
      * Paranoia: Check that the BIOS ROM hasn't changed.
      */
-    PVM pVM = pDevIns->pDevHlp->pfnGetVM(pDevIns);
+    PVM pVM = PDMDevHlpGetVM(pDevIns);
     /* the low ROM mapping. */
     unsigned cb = RT_MIN(g_cbPcBiosBinary, 128 * _1K);

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -2391 +2391 @@
                         PPDMDEVINS pDevIns = ATADEVSTATE_2_DEVINS(s);
                         PVMREQ pReq;
-                        rc = VMR3ReqCall(pDevIns->pDevHlp->pfnGetVM(pDevIns), &pReq, RT_INDEFINITE_WAIT,
+                        rc = VMR3ReqCall(PDMDevHlpGetVM(pDevIns), &pReq, RT_INDEFINITE_WAIT,
                                          (PFNRT)s->pDrvMount->pfnUnmount, 1, s->pDrvMount);
                         AssertReleaseRC(rc);
@@ -4580 +4580 @@
             MMGCRamWriteNoTrapHandler((char *)GCDst + i, s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, cb);
 #else /* !IN_GC */
-        rc = PGMPhysWriteGCPtrDirty(pDevIns->pDevHlp->pfnGetVM(pDevIns), GCDst, s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, cbTransfer);
+        rc = PGMPhysWriteGCPtrDirty(PDMDevHlpGetVM(pDevIns), GCDst, s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, cbTransfer);
         Assert(rc == VINF_SUCCESS);
 #endif /* IN_GC */
@@ -4637 +4637 @@
             MMGCRamReadNoTrapHandler(s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, (char *)GCSrc + i, cb);
 #else /* !IN_GC */
-        rc = PGMPhysReadGCPtr(pDevIns->pDevHlp->pfnGetVM(pDevIns), s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, GCSrc, cbTransfer);
+        rc = PGMPhysReadGCPtr(PDMDevHlpGetVM(pDevIns), s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, GCSrc, cbTransfer);
         Assert(rc == VINF_SUCCESS);
 #endif /* IN_GC */
@@ -4728 +4728 @@
      * can be either from ataPowerOff or ataSuspend), there is no other
      * reasonable solution. */
-    fVMLocked = VMMR3LockIsOwner(pDevIns->pDevHlp->pfnGetVM(pDevIns));
+    fVMLocked = VMMR3LockIsOwner(PDMDevHlpGetVM(pDevIns));
 
     if (fVMLocked)
@@ -4764 +4764 @@
 {
     if (s->pbIOBufferHC)
-        s->pbIOBufferGC = MMHyperHC2GC(pDevIns->pDevHlp->pfnGetVM(pDevIns), s->pbIOBufferHC);
+        s->pbIOBufferGC = MMHyperHC2GC(PDMDevHlpGetVM(pDevIns), s->pbIOBufferHC);
 }
 
@@ -4943 +4943 @@
      * Allocate I/O buffer.
      */
+    PVM pVM = PDMDevHlpGetVM(pDevIns);
     if (pIf->cbIOBuffer)
     {
@@ -4952 +4953 @@
             AssertRelease(pIf->cbIOBuffer == ATA_MAX_MULT_SECTORS * 512);
         Assert(pIf->pbIOBufferHC);
-        Assert(pIf->pbIOBufferGC == MMHyperHC2GC(pDevIns->pDevHlp->pfnGetVM(pDevIns), pIf->pbIOBufferHC));
+        Assert(pIf->pbIOBufferGC == MMHyperHC2GC(pVM, pIf->pbIOBufferHC));
     }
     else
@@ -4961 +4962 @@
             pIf->cbIOBuffer = ATA_MAX_MULT_SECTORS * 512;
         Assert(!pIf->pbIOBufferHC);
-        rc = MMHyperAlloc(pDevIns->pDevHlp->pfnGetVM(pDevIns), pIf->cbIOBuffer, 1, MM_TAG_PDM_DEVICE_USER, (void **)&pIf->pbIOBufferHC);
+        rc = MMHyperAlloc(pVM, pIf->cbIOBuffer, 1, MM_TAG_PDM_DEVICE_USER, (void **)&pIf->pbIOBufferHC);
         if (VBOX_FAILURE(rc))
             return VERR_NO_MEMORY;
-        pIf->pbIOBufferGC = MMHyperHC2GC(pDevIns->pDevHlp->pfnGetVM(pDevIns), pIf->pbIOBufferHC);
+        pIf->pbIOBufferGC = MMHyperHC2GC(pVM, pIf->pbIOBufferHC);
     }
 
@@ -5404 +5405 @@
             pData->aCts[i].aIfs[j].pDevInsGC = PDMDEVINS_2_GCPTR(pDevIns);
             pData->aCts[i].aIfs[j].pControllerHC = &pData->aCts[i];
-            pData->aCts[i].aIfs[j].pControllerGC = MMHyperHC2GC(pDevIns->pDevHlp->pfnGetVM(pDevIns), &pData->aCts[i]);
+            pData->aCts[i].aIfs[j].pControllerGC = MMHyperHC2GC(PDMDevHlpGetVM(pDevIns), &pData->aCts[i]);
             pData->aCts[i].aIfs[j].IBase.pfnQueryInterface = ataQueryInterface;
             pData->aCts[i].aIfs[j].IMountNotify.pfnMountNotify = ataMountNotify;

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

@@ -236 +236 @@
 {
     PPDMDEVINS pDevIns = VMMDEVSTATE_2_DEVINS(pVMMDevState);
-    PVM pVM = pDevIns->pDevHlp->pfnGetVM(pDevIns);
+    PVM pVM = PDMDevHlpGetVM(pDevIns);
     int rc;
     PVMREQ pReq;
@@ -645 +645 @@
             {
                 VMMDevReqHypervisorInfo *hypervisorInfo = (VMMDevReqHypervisorInfo*)requestHeader;
-                PVM pVM = pDevIns->pDevHlp->pfnGetVM(pDevIns);
+                PVM pVM = PDMDevHlpGetVM(pDevIns);
                 size_t hypervisorSize = 0;
                 requestHeader->rc = PGMR3MappingsSize(pVM, &hypervisorSize);
@@ -667 +667 @@
             {
                 VMMDevReqHypervisorInfo *hypervisorInfo = (VMMDevReqHypervisorInfo*)requestHeader;
-                PVM pVM = pDevIns->pDevHlp->pfnGetVM(pDevIns);
+                PVM pVM = PDMDevHlpGetVM(pDevIns);
                 if (hypervisorInfo->hypervisorStart == 0)
                 {
@@ -1184 +1184 @@
          * already registered before trying to do that all over again.
          */
-        PVM pVM = pPciDev->pDevIns->pDevHlp->pfnGetVM(pPciDev->pDevIns);
+        PVM pVM = PDMDevHlpGetVM(pPciDev->pDevIns);
 
         if (pData->GCPhysVMMDevRAM)