Changeset 81996 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2019 2:41:07 PM (5 years ago)

Author:

vboxsync

Message:

DevACPI: Converted the timer pointers to a handle and eliminated the pDevInsR* members. bugref:9218

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (72 diffs)

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

@@ -293 +293 @@
     /** Number of logical CPUs in guest */
     uint16_t            cCpus;
+
     uint64_t            u64PmTimerInitial;
-    PTMTIMERR3          pPmTimerR3;
-    PTMTIMERR0          pPmTimerR0;
-    PTMTIMERRC          pPmTimerRC;
-
+    /** The PM timer. */
+    TMTIMERHANDLE       hPmTimer;
     /* PM Timer last calculated value */
     uint32_t            uPmTimerVal;
@@ -422 +421 @@
     PPDMDEVINSR3        pDevIns;
 
-    /** Pointer to the device instance. */
-    PPDMDEVINSR3        pDevInsR3;
-    PPDMDEVINSR0        pDevInsR0;
-    PPDMDEVINSRC        pDevInsRC;
-
-    uint32_t            Alignment3;
     /** Pointer to the driver base interface. */
     R3PTRTYPE(PPDMIBASE) pDrvBase;
@@ -777 +770 @@
 RT_C_DECLS_END
 #ifdef IN_RING3
-static int acpiR3PlantTables(ACPIState *pThis);
+static int acpiR3PlantTables(PPDMDEVINS pDevIns, ACPIState *pThis);
 #endif
 
 /* SCI, usually IRQ9 */
-DECLINLINE(void) acpiSetIrq(ACPIState *pThis, int level)
-{
-    PDMDevHlpPCISetIrq(pThis->CTX_SUFF(pDevIns), 0, level);
+DECLINLINE(void) acpiSetIrq(PPDMDEVINS pDevIns, int level)
+{
+    PDMDevHlpPCISetIrq(pDevIns, 0, level);
 }
 
@@ -836 +829 @@
 
     if (new_level != old_level)
-        acpiSetIrq(pThis, new_level);
+        acpiSetIrq(pDevIns, new_level);
 }
 
@@ -864 +857 @@
 
     if (new_level != old_level)
-        acpiSetIrq(pThis, new_level);
+        acpiSetIrq(pDevIns, new_level);
 }
 
@@ -870 +863 @@
  * Used by acpiR3PM1aCtlWrite to power off the VM.
  *
+ * @param   pDevIns     The device instance.
+ * @returns Strict VBox status code.
+ */
+static int acpiR3DoPowerOff(PPDMDEVINS pDevIns)
+{
+    int rc = PDMDevHlpVMPowerOff(pDevIns);
+    AssertRC(rc);
+    return rc;
+}
+
+/**
+ * Used by acpiR3PM1aCtlWrite to put the VM to sleep.
+ *
+ * @param   pDevIns     The device instance.
  * @param   pThis   The ACPI shared instance data.
  * @returns Strict VBox status code.
  */
-static int acpiR3DoPowerOff(ACPIState *pThis)
-{
-    int rc = PDMDevHlpVMPowerOff(pThis->pDevInsR3);
-    if (RT_FAILURE(rc))
-        AssertMsgFailed(("Could not power down the VM. rc = %Rrc\n", rc));
-    return rc;
-}
-
-/**
- * Used by acpiR3PM1aCtlWrite to put the VM to sleep.
- *
- * @param   pThis   The ACPI shared instance data.
- * @returns Strict VBox status code.
- */
-static int acpiR3DoSleep(ACPIState *pThis)
+static int acpiR3DoSleep(PPDMDEVINS pDevIns, ACPIState *pThis)
 {
     /* We must set WAK_STS on resume (includes restore) so the guest knows that
@@ -896 +889 @@
     if (pThis->fSuspendToSavedState)
     {
-        rc = PDMDevHlpVMSuspendSaveAndPowerOff(pThis->pDevInsR3);
+        rc = PDMDevHlpVMSuspendSaveAndPowerOff(pDevIns);
         if (rc != VERR_NOT_SUPPORTED)
             AssertRC(rc);
@@ -902 +895 @@
         {
             LogRel(("ACPI: PDMDevHlpVMSuspendSaveAndPowerOff is not supported, falling back to suspend-only\n"));
-            rc = PDMDevHlpVMSuspend(pThis->pDevInsR3);
+            rc = PDMDevHlpVMSuspend(pDevIns);
             AssertRC(rc);
         }
@@ -908 +901 @@
     else
     {
-        rc = PDMDevHlpVMSuspend(pThis->pDevInsR3);
+        rc = PDMDevHlpVMSuspend(pDevIns);
         AssertRC(rc);
     }
@@ -1040 +1033 @@
  * the VM is resetting or loading state.
  *
- * @param   pThis               The ACPI shared instance data.
- * @param   uNow                The current time.
- */
-static void acpiR3PmTimerReset(ACPIState *pThis, uint64_t uNow)
-{
-    uint64_t uTimerFreq = TMTimerGetFreq(pThis->CTX_SUFF(pPmTimer));
+ * @param   pDevIns     The device instance.
+ * @param   pThis       The ACPI shared instance data.
+ * @param   uNow        The current time.
+ */
+static void acpiR3PmTimerReset(PPDMDEVINS pDevIns, ACPIState *pThis, uint64_t uNow)
+{
+    uint64_t uTimerFreq = PDMDevHlpTimerGetFreq(pDevIns, pThis->hPmTimer);
     uint32_t uPmTmrCyclesToRollover = TMR_VAL_MSB - (pThis->uPmTimerVal & (TMR_VAL_MSB - 1));
     uint64_t uInterval  = ASMMultU64ByU32DivByU32(uPmTmrCyclesToRollover, uTimerFreq, PM_TMR_FREQ);
-    TMTimerSet(pThis->pPmTimerR3, uNow + uInterval + 1);
+    PDMDevHlpTimerSet(pDevIns, pThis->hPmTimer, uNow + uInterval + 1);
     Log(("acpi: uInterval = %RU64\n", uInterval));
 }
@@ -1068 +1062 @@
     uint32_t msb = pThis->uPmTimerVal & TMR_VAL_MSB;
     uint64_t u64Elapsed = u64Now - pThis->u64PmTimerInitial;
-    Assert(TMTimerIsLockOwner(pThis->CTX_SUFF(pPmTimer)));
-
-    pThis->uPmTimerVal = ASMMultU64ByU32DivByU32(u64Elapsed, PM_TMR_FREQ, TMTimerGetFreq(pThis->CTX_SUFF(pPmTimer))) & TMR_VAL_MASK;
+    Assert(PDMDevHlpTimerIsLockOwner(pDevIns, pThis->hPmTimer));
+
+    pThis->uPmTimerVal = ASMMultU64ByU32DivByU32(u64Elapsed, PM_TMR_FREQ,
+                                                 PDMDevHlpTimerGetFreq(pDevIns, pThis->hPmTimer))
+                       & TMR_VAL_MASK;
 
     if ( (pThis->uPmTimerVal & TMR_VAL_MSB) != msb)
@@ -1084 +1080 @@
 {
     PACPISTATE pThis = PDMDEVINS_2_DATA(pDevIns, PACPISTATE);
-    Assert(TMTimerIsLockOwner(pTimer));
-    RT_NOREF(pvUser);
+    Assert(PDMDevHlpTimerIsLockOwner(pDevIns, pThis->hPmTimer));
+    RT_NOREF(pTimer, pvUser);
 
     DEVACPI_LOCK_R3(pDevIns, pThis);
@@ -1091 +1087 @@
          pThis->pm1a_sts, (pThis->pm1a_sts & TMR_STS) != 0,
          pThis->pm1a_en, (pThis->pm1a_en & TMR_EN) != 0));
-    uint64_t u64Now = TMTimerGet(pTimer);
+    uint64_t u64Now = PDMDevHlpTimerGet(pDevIns, pThis->hPmTimer);
     acpiPmTimerUpdate(pDevIns, pThis, u64Now);
     DEVACPI_UNLOCK(pDevIns, pThis);
 
-    acpiR3PmTimerReset(pThis, u64Now);
+    acpiR3PmTimerReset(pDevIns, pThis, u64Now);
 }
 
@@ -1693 +1689 @@
                 {
                     LogRel(("ACPI: Entering S1 power state (powered-on suspend)\n"));
-                    rc = acpiR3DoSleep(pThis);
+                    rc = acpiR3DoSleep(pDevIns, pThis);
                     break;
                 }
@@ -1703 +1699 @@
                 {
                     LogRel(("ACPI: Entering S4 power state (suspend to disk)\n"));
-                    rc = acpiR3DoPowerOff(pThis);/* Same behavior as S5 */
+                    rc = acpiR3DoPowerOff(pDevIns);/* Same behavior as S5 */
                     break;
                 }
@@ -1711 +1707 @@
             case 0x05:                  /* S5 */
                 LogRel(("ACPI: Entering S5 power state (power down)\n"));
-                rc = acpiR3DoPowerOff(pThis);
+                rc = acpiR3DoPowerOff(pDevIns);
                 break;
 
@@ -1745 +1741 @@
      */
 
-    int rc = TMTimerLock(pThis->CTX_SUFF(pPmTimer), VINF_IOM_R3_IOPORT_READ);
-    if (rc != VINF_SUCCESS)
-        return rc;
-
-    rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_IOM_R3_IOPORT_READ);
-    if (rc != VINF_SUCCESS)
-    {
-        TMTimerUnlock(pThis->CTX_SUFF(pPmTimer));
-        return rc;
-    }
-
-    uint64_t u64Now = TMTimerGet(pThis->CTX_SUFF(pPmTimer));
-    acpiPmTimerUpdate(pDevIns, pThis, u64Now);
-    *pu32 = pThis->uPmTimerVal;
-
-    DEVACPI_UNLOCK(pDevIns, pThis);
-    TMTimerUnlock(pThis->CTX_SUFF(pPmTimer));
-
-    DBGFTRACE_PDM_U64_TAG(pDevIns, u64Now, "acpi");
-    Log(("acpi: acpiPMTmrRead -> %#x\n", *pu32));
+    int rc = PDMDevHlpTimerLock(pDevIns, pThis->hPmTimer, VINF_IOM_R3_IOPORT_READ);
+    if (rc == VINF_SUCCESS)
+    {
+        rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_IOM_R3_IOPORT_READ);
+        if (rc == VINF_SUCCESS)
+        {
+            uint64_t u64Now = PDMDevHlpTimerGet(pDevIns, pThis->hPmTimer);
+            acpiPmTimerUpdate(pDevIns, pThis, u64Now);
+            *pu32 = pThis->uPmTimerVal;
+
+            DEVACPI_UNLOCK(pDevIns, pThis);
+            PDMDevHlpTimerUnlock(pDevIns, pThis->hPmTimer);
+
+            DBGFTRACE_PDM_U64_TAG(pDevIns, u64Now, "acpi");
+            Log(("acpi: acpiPMTmrRead -> %#x\n", *pu32));
 
 #if 0
-    /** @todo temporary: sanity check against running backwards */
-    uint32_t uOld = ASMAtomicXchgU32(&pThis->uPmTimeOld, *pu32);
-    if (*pu32 - uOld >= 0x10000000)
-    {
+            /** @todo temporary: sanity check against running backwards */
+            uint32_t uOld = ASMAtomicXchgU32(&pThis->uPmTimeOld, *pu32);
+            if (*pu32 - uOld >= 0x10000000)
+            {
 # if defined(IN_RING0)
-        pThis->uPmTimeA = uOld;
-        pThis->uPmTimeB = *pu32;
-        return VERR_TM_TIMER_BAD_CLOCK;
+                pThis->uPmTimeA = uOld;
+                pThis->uPmTimeB = *pu32;
+                return VERR_TM_TIMER_BAD_CLOCK;
 # elif defined(IN_RING3)
-        AssertReleaseMsgFailed(("acpiPMTmrRead: old=%08RX32, current=%08RX32\n", uOld, *pu32));
+                AssertReleaseMsgFailed(("acpiPMTmrRead: old=%08RX32, current=%08RX32\n", uOld, *pu32));
 # endif
-    }
+            }
 #endif
-
+        }
+        else
+            PDMDevHlpTimerUnlock(pDevIns, pThis->hPmTimer);
+    }
     NOREF(pvUser); NOREF(Port);
     return rc;
@@ -2011 +2005 @@
 #define R(offset, cnt, writer, reader, description) \
     do { \
-        int rc = PDMDevHlpIOPortRegister(pThis->pDevInsR3, acpiR3CalcPmPort(pThis, offset), cnt, pThis, writer, reader, \
+        int rc = PDMDevHlpIOPortRegister(pDevIns, acpiR3CalcPmPort(pThis, offset), cnt, pThis, writer, reader, \
                                          NULL, NULL, description); \
         if (RT_FAILURE(rc)) \
@@ -2030 +2024 @@
     if (pDevIns->fRCEnabled)
     {
-        int rc = PDMDevHlpIOPortRegisterRC(pThis->pDevInsR3, acpiR3CalcPmPort(pThis, PM_TMR_OFFSET),
+        int rc = PDMDevHlpIOPortRegisterRC(pDevIns, acpiR3CalcPmPort(pThis, PM_TMR_OFFSET),
                                            1, 0, NULL, "acpiPMTmrRead",
                                            NULL, NULL, "ACPI PM Timer");
@@ -2039 +2033 @@
     if (pDevIns->fR0Enabled)
     {
-        int rc = PDMDevHlpIOPortRegisterR0(pThis->pDevInsR3, acpiR3CalcPmPort(pThis, PM_TMR_OFFSET),
+        int rc = PDMDevHlpIOPortRegisterR0(pDevIns, acpiR3CalcPmPort(pThis, PM_TMR_OFFSET),
                                            1, 0, NULL, "acpiPMTmrRead",
                                            NULL, NULL, "ACPI PM Timer");
@@ -2053 +2047 @@
  *
  * @returns VBox status code.
- * @param   pThis           The ACPI shared instance data.
- */
-static int acpiR3UnregisterPmHandlers(ACPIState *pThis)
+ * @param   pDevIns     The device instance.
+ * @param   pThis       The ACPI shared instance data.
+ */
+static int acpiR3UnregisterPmHandlers(PPDMDEVINS pDevIns, ACPIState *pThis)
 {
     if (pThis->uPmIoPortBase == 0)
@@ -2062 +2057 @@
 #define U(offset, cnt) \
     do { \
-        int rc = PDMDevHlpIOPortDeregister(pThis->pDevInsR3, acpiR3CalcPmPort(pThis, offset), cnt); \
+        int rc = PDMDevHlpIOPortDeregister(pDevIns, acpiR3CalcPmPort(pThis, offset), cnt); \
         AssertRCReturn(rc, rc); \
     } while (0)
@@ -2094 +2089 @@
     if (NewIoPortBase != pThis->uPmIoPortBase)
     {
-        int rc = acpiR3UnregisterPmHandlers(pThis);
+        int rc = acpiR3UnregisterPmHandlers(pDevIns, pThis);
         if (RT_FAILURE(rc))
             return rc;
@@ -2105 +2100 @@
 
         /* We have to update FADT table acccording to the new base */
-        rc = acpiR3PlantTables(pThis);
+        rc = acpiR3PlantTables(pDevIns, pThis);
         AssertRC(rc);
         if (RT_FAILURE(rc))
@@ -2161 +2156 @@
              * needs to be implemented later if it ever becomes relevant. */
             if (new_level != old_level)
-                acpiSetIrq(pThis, new_level);
+                acpiSetIrq(pDevIns, new_level);
             break;
         }
@@ -2315 +2310 @@
  *
  * @returns VBox status code.
- * @param   pThis           The ACPI shared instance data.
- */
-static int acpiR3RegisterSMBusHandlers(ACPIState *pThis)
-{
-    int   rc = VINF_SUCCESS;
-
+ * @param   pDevIns     The device instance.
+ * @param   pThis       The ACPI shared instance data.
+ */
+static int acpiR3RegisterSMBusHandlers(PPDMDEVINS pDevIns, ACPIState *pThis)
+{
     if (pThis->uSMBusIoPortBase == 0)
         return VINF_SUCCESS;
 
-    rc = PDMDevHlpIOPortRegister(pThis->pDevInsR3, pThis->uSMBusIoPortBase, 16, pThis, acpiR3SMBusWrite, acpiR3SMBusRead, NULL, NULL, "SMBus");
+    int rc = PDMDevHlpIOPortRegister(pDevIns, pThis->uSMBusIoPortBase, 16, pThis, acpiR3SMBusWrite, acpiR3SMBusRead, NULL, NULL, "SMBus");
     if (RT_FAILURE(rc))
         return rc;
@@ -2335 +2329 @@
  *
  * @returns VBox status code.
- * @param   pThis           The ACPI shared instance data.
- */
-static int acpiR3UnregisterSMBusHandlers(ACPIState *pThis)
+ * @param   pDevIns     The device instance.
+ * @param   pThis       The ACPI shared instance data.
+ */
+static int acpiR3UnregisterSMBusHandlers(PPDMDEVINS pDevIns, ACPIState *pThis)
 {
     if (pThis->uSMBusIoPortBase == 0)
         return VINF_SUCCESS;
 
-    int rc = PDMDevHlpIOPortDeregister(pThis->pDevInsR3, pThis->uSMBusIoPortBase, 16);
+    int rc = PDMDevHlpIOPortDeregister(pDevIns, pThis->uSMBusIoPortBase, 16);
     AssertRCReturn(rc, rc);
 
@@ -2354 +2349 @@
  * @returns VBox status code.
  *
+ * @param   pDevIns         The device instance.
  * @param   pThis           The ACPI shared instance data.
  * @param   NewIoPortBase   The new base address of the I/O ports.
  */
-static int acpiR3UpdateSMBusHandlers(ACPIState *pThis, RTIOPORT NewIoPortBase)
+static int acpiR3UpdateSMBusHandlers(PPDMDEVINS pDevIns, ACPIState *pThis, RTIOPORT NewIoPortBase)
 {
     Log(("acpi: rebasing SMBus 0x%x -> 0x%x\n", pThis->uSMBusIoPortBase, NewIoPortBase));
     if (NewIoPortBase != pThis->uSMBusIoPortBase)
     {
-        int rc = acpiR3UnregisterSMBusHandlers(pThis);
+        int rc = acpiR3UnregisterSMBusHandlers(pDevIns, pThis);
         if (RT_FAILURE(rc))
             return rc;
@@ -2368 +2364 @@
         pThis->uSMBusIoPortBase = NewIoPortBase;
 
-        rc = acpiR3RegisterSMBusHandlers(pThis);
+        rc = acpiR3RegisterSMBusHandlers(pDevIns, pThis);
         if (RT_FAILURE(rc))
             return rc;
@@ -2523 +2519 @@
      * successfully loaded.
      */
-    int rc = acpiR3UnregisterPmHandlers(pThis);
+    int rc = acpiR3UnregisterPmHandlers(pDevIns, pThis);
     if (RT_FAILURE(rc))
         return rc;
@@ -2531 +2527 @@
      * successfully loaded.
      */
-    rc = acpiR3UnregisterSMBusHandlers(pThis);
+    rc = acpiR3UnregisterSMBusHandlers(pDevIns, pThis);
     if (RT_FAILURE(rc))
         return rc;
@@ -2564 +2560 @@
         if (RT_FAILURE(rc))
             return rc;
-        rc = acpiR3RegisterSMBusHandlers(pThis);
+        rc = acpiR3RegisterSMBusHandlers(pDevIns, pThis);
         if (RT_FAILURE(rc))
             return rc;
@@ -2573 +2569 @@
         if (RT_FAILURE(rc))
             return rc;
-        TMTimerLock(pThis->pPmTimerR3, VERR_IGNORED);
+        PDMDevHlpTimerLock(pDevIns, pThis->hPmTimer, VERR_IGNORED);
         DEVACPI_LOCK_R3(pDevIns, pThis);
-        uint64_t u64Now = TMTimerGet(pThis->pPmTimerR3);
+        uint64_t u64Now = PDMDevHlpTimerGet(pDevIns, pThis->hPmTimer);
         /* The interrupt may be incorrectly re-generated if the state is restored from versions < 7. */
         acpiPmTimerUpdate(pDevIns, pThis, u64Now);
-        acpiR3PmTimerReset(pThis, u64Now);
+        acpiR3PmTimerReset(pDevIns, pThis, u64Now);
         DEVACPI_UNLOCK(pDevIns, pThis);
-        TMTimerUnlock(pThis->pPmTimerR3);
+        PDMDevHlpTimerUnlock(pDevIns, pThis->hPmTimer);
     }
     return rc;
@@ -2649 +2645 @@
  * Wrapper around PDMDevHlpPhysWrite used when planting ACPI tables.
  */
-DECLINLINE(void) acpiR3PhysCopy(ACPIState *pThis, RTGCPHYS32 GCPhys32Dst, const void *pvSrc, size_t cbToCopy)
-{
-    PDMDevHlpPhysWrite(pThis->pDevInsR3, GCPhys32Dst, pvSrc, cbToCopy);
+DECLINLINE(void) acpiR3PhysCopy(PPDMDEVINS pDevIns, RTGCPHYS32 GCPhys32Dst, const void *pvSrc, size_t cbToCopy)
+{
+    PDMDevHlpPhysWrite(pDevIns, GCPhys32Dst, pvSrc, cbToCopy);
 }
 
@@ -2657 +2653 @@
  * Plant the Differentiated System Description Table (DSDT).
  */
-static void acpiR3SetupDsdt(ACPIState *pThis, RTGCPHYS32 GCPhys32, void *pvPtr, size_t cbDsdt)
-{
-    acpiR3PhysCopy(pThis, GCPhys32, pvPtr, cbDsdt);
-}
-
-/**
- * Plan the Secondary System Description Table (SSDT).
- */
-static void acpiR3SetupSsdt(ACPIState *pThis, RTGCPHYS32 addr,
-                            void* pPtr, size_t uSsdtLen)
-{
-    acpiR3PhysCopy(pThis, addr, pPtr, uSsdtLen);
+static void acpiR3SetupDsdt(PPDMDEVINS pDevIns, RTGCPHYS32 GCPhys32, void const *pvSrc, size_t cbDsdt)
+{
+    acpiR3PhysCopy(pDevIns, GCPhys32, pvSrc, cbDsdt);
+}
+
+/**
+ * Plant the Secondary System Description Table (SSDT).
+ */
+static void acpiR3SetupSsdt(PPDMDEVINS pDevIns, RTGCPHYS32 addr, void const *pvSrc, size_t uSsdtLen)
+{
+    acpiR3PhysCopy(pDevIns, addr, pvSrc, uSsdtLen);
 }
 
@@ -2674 +2669 @@
  * Plant the Firmware ACPI Control Structure (FACS).
  */
-static void acpiR3SetupFacs(ACPIState *pThis, RTGCPHYS32 addr)
+static void acpiR3SetupFacs(PPDMDEVINS pDevIns, RTGCPHYS32 addr)
 {
     ACPITBLFACS facs;
@@ -2688 +2683 @@
     facs.u8Version            = 1;
 
-    acpiR3PhysCopy(pThis, addr, (const uint8_t *)&facs, sizeof(facs));
+    acpiR3PhysCopy(pDevIns, addr, (const uint8_t *)&facs, sizeof(facs));
 }
 
@@ -2694 +2689 @@
  * Plant the Fixed ACPI Description Table (FADT aka FACP).
  */
-static void acpiR3SetupFadt(ACPIState *pThis, RTGCPHYS32 GCPhysAcpi1, RTGCPHYS32 GCPhysAcpi2,
+static void acpiR3SetupFadt(PPDMDEVINS pDevIns, ACPIState *pThis, RTGCPHYS32 GCPhysAcpi1, RTGCPHYS32 GCPhysAcpi2,
                             RTGCPHYS32 GCPhysFacs, RTGCPHYS GCPhysDsdt)
 {
@@ -2761 +2756 @@
     acpiR3WriteGenericAddr(&fadt.X_GPE1BLK,    0,  0, 0, 0, acpiR3CalcPmPort(pThis, GPE1_OFFSET));
     fadt.header.u8Checksum    = acpiR3Checksum(&fadt, sizeof(fadt));
-    acpiR3PhysCopy(pThis, GCPhysAcpi2, &fadt, sizeof(fadt));
+    acpiR3PhysCopy(pDevIns, GCPhysAcpi2, &fadt, sizeof(fadt));
 
     /* Now the ACPI 1.0 version. */
@@ -2768 +2763 @@
     fadt.header.u8Checksum    = 0;  /* Must be zeroed before recalculating checksum! */
     fadt.header.u8Checksum    = acpiR3Checksum(&fadt, ACPITBLFADT_VERSION1_SIZE);
-    acpiR3PhysCopy(pThis, GCPhysAcpi1, &fadt, ACPITBLFADT_VERSION1_SIZE);
+    acpiR3PhysCopy(pDevIns, GCPhysAcpi1, &fadt, ACPITBLFADT_VERSION1_SIZE);
 }
 
@@ -2778 +2773 @@
  * ACPI 2.0 and up.
  */
-static int acpiR3SetupRsdt(ACPIState *pThis, RTGCPHYS32 addr, unsigned int nb_entries, uint32_t *addrs)
+static int acpiR3SetupRsdt(PPDMDEVINS pDevIns, ACPIState *pThis, RTGCPHYS32 addr, unsigned int nb_entries, uint32_t *addrs)
 {
     ACPITBLRSDT *rsdt;
@@ -2785 +2780 @@
     rsdt = (ACPITBLRSDT*)RTMemAllocZ(size);
     if (!rsdt)
-        return PDMDEV_SET_ERROR(pThis->pDevInsR3, VERR_NO_TMP_MEMORY, N_("Cannot allocate RSDT"));
+        return PDMDEV_SET_ERROR(pDevIns, VERR_NO_TMP_MEMORY, N_("Cannot allocate RSDT"));
 
     acpiR3PrepareHeader(pThis, &rsdt->header, "RSDT", (uint32_t)size, 1);
@@ -2794 +2789 @@
     }
     rsdt->header.u8Checksum = acpiR3Checksum(rsdt, size);
-    acpiR3PhysCopy(pThis, addr, rsdt, size);
+    acpiR3PhysCopy(pDevIns, addr, rsdt, size);
     RTMemFree(rsdt);
     return VINF_SUCCESS;
@@ -2802 +2797 @@
  * Plant the Extended System Description Table.
  */
-static int acpiR3SetupXsdt(ACPIState *pThis, RTGCPHYS32 addr, unsigned int nb_entries, uint32_t *addrs)
+static int acpiR3SetupXsdt(PPDMDEVINS pDevIns, ACPIState *pThis, RTGCPHYS32 addr, unsigned int nb_entries, uint32_t *addrs)
 {
     ACPITBLXSDT *xsdt;
@@ -2822 +2817 @@
     }
     xsdt->header.u8Checksum = acpiR3Checksum(xsdt, size);
-    acpiR3PhysCopy(pThis, addr, xsdt, size);
+    acpiR3PhysCopy(pDevIns, addr, xsdt, size);
     RTMemFree(xsdt);
     return VINF_SUCCESS;
@@ -2971 +2966 @@
  * @todo    All hardcoded, should set this up based on the actual VM config!!!!!
  */
-static void acpiR3SetupMadt(ACPIState *pThis, RTGCPHYS32 addr)
+static void acpiR3SetupMadt(PPDMDEVINS pDevIns, ACPIState *pThis, RTGCPHYS32 addr)
 {
     uint16_t cpus = pThis->cCpus;
@@ -3036 +3031 @@
 
     madt.header_addr()->u8Checksum = acpiR3Checksum(madt.data(), madt.size());
-    acpiR3PhysCopy(pThis, addr, madt.data(), madt.size());
+    acpiR3PhysCopy(pDevIns, addr, madt.data(), madt.size());
 }
 
@@ -3042 +3037 @@
  * Plant the High Performance Event Timer (HPET) descriptor.
  */
-static void acpiR3SetupHpet(ACPIState *pThis, RTGCPHYS32 addr)
+static void acpiR3SetupHpet(PPDMDEVINS pDevIns, ACPIState *pThis, RTGCPHYS32 addr)
 {
     ACPITBLHPET hpet;
@@ -3064 +3059 @@
     hpet.aHeader.u8Checksum = acpiR3Checksum(&hpet, sizeof(hpet));
 
-    acpiR3PhysCopy(pThis, addr, (const uint8_t *)&hpet, sizeof(hpet));
+    acpiR3PhysCopy(pDevIns, addr, (const uint8_t *)&hpet, sizeof(hpet));
 }
 
@@ -3075 +3070 @@
  * @param   GCPhysDst   Where to plant it.
  */
-static void acpiR3SetupMcfg(ACPIState *pThis, RTGCPHYS32 GCPhysDst)
+static void acpiR3SetupMcfg(PPDMDEVINS pDevIns, ACPIState *pThis, RTGCPHYS32 GCPhysDst)
 {
     struct
@@ -3095 +3090 @@
     tbl.hdr.aHeader.u8Checksum = acpiR3Checksum(&tbl, sizeof(tbl));
 
-    acpiR3PhysCopy(pThis, GCPhysDst, (const uint8_t *)&tbl, sizeof(tbl));
+    acpiR3PhysCopy(pDevIns, GCPhysDst, (const uint8_t *)&tbl, sizeof(tbl));
 }
 
@@ -3161 +3156 @@
  * Create the ACPI tables in guest memory.
  */
-static int acpiR3PlantTables(ACPIState *pThis)
+static int acpiR3PlantTables(PPDMDEVINS pDevIns, ACPIState *pThis)
 {
     int        rc;
@@ -3210 +3205 @@
      * The latter starts never below 4G.
      */
-    PVM pVM                    = PDMDevHlpGetVM(pThis->pDevInsR3);
+    PVM pVM                    = PDMDevHlpGetVM(pDevIns);
     uint32_t        cbBelow4GB = MMR3PhysGetRamSizeBelow4GB(pVM);
     uint64_t const  cbAbove4GB = MMR3PhysGetRamSizeAbove4GB(pVM);
@@ -3278 +3273 @@
     void  *pvSsdtCode = NULL;
     size_t cbSsdt = 0;
-    rc = acpiPrepareSsdt(pThis->pDevInsR3, &pvSsdtCode, &cbSsdt);
+    rc = acpiPrepareSsdt(pDevIns, &pvSsdtCode, &cbSsdt);
     if (RT_FAILURE(rc))
         return rc;
@@ -3289 +3284 @@
     void  *pvDsdtCode = NULL;
     size_t cbDsdt = 0;
-    rc = acpiPrepareDsdt(pThis->pDevInsR3, &pvDsdtCode, &cbDsdt);
+    rc = acpiPrepareDsdt(pDevIns, &pvDsdtCode, &cbDsdt);
     if (RT_FAILURE(rc))
         return rc;
@@ -3296 +3291 @@
 
     if (GCPhysCur > 0x10000)
-        return PDMDEV_SET_ERROR(pThis->pDevInsR3, VERR_TOO_MUCH_DATA,
+        return PDMDEV_SET_ERROR(pDevIns, VERR_TOO_MUCH_DATA,
                                 N_("Error: ACPI tables bigger than 64KB"));
 
@@ -3316 +3311 @@
 
     acpiR3SetupRsdp(pThis, (ACPITBLRSDP *)pThis->au8RSDPPage, GCPhysRsdt + addend, GCPhysXsdt + addend);
-    acpiR3SetupDsdt(pThis, GCPhysDsdt + addend, pvDsdtCode, cbDsdt);
-    acpiCleanupDsdt(pThis->pDevInsR3, pvDsdtCode);
-    acpiR3SetupFacs(pThis, GCPhysFacs + addend);
-    acpiR3SetupFadt(pThis, GCPhysFadtAcpi1 + addend, GCPhysFadtAcpi2 + addend, GCPhysFacs + addend, GCPhysDsdt + addend);
+    acpiR3SetupDsdt(pDevIns, GCPhysDsdt + addend, pvDsdtCode, cbDsdt);
+    acpiCleanupDsdt(pDevIns, pvDsdtCode);
+    acpiR3SetupFacs(pDevIns, GCPhysFacs + addend);
+    acpiR3SetupFadt(pDevIns, pThis, GCPhysFadtAcpi1 + addend, GCPhysFadtAcpi2 + addend, GCPhysFacs + addend, GCPhysDsdt + addend);
 
     aGCPhysRsdt[0] = GCPhysFadtAcpi1 + addend;
@@ -3325 +3320 @@
     if (pThis->u8UseIOApic)
     {
-        acpiR3SetupMadt(pThis, GCPhysApic + addend);
+        acpiR3SetupMadt(pDevIns, pThis, GCPhysApic + addend);
         aGCPhysRsdt[iMadt] = GCPhysApic + addend;
         aGCPhysXsdt[iMadt] = GCPhysApic + addend;
@@ -3331 +3326 @@
     if (pThis->fUseHpet)
     {
-        acpiR3SetupHpet(pThis, GCPhysHpet + addend);
+        acpiR3SetupHpet(pDevIns, pThis, GCPhysHpet + addend);
         aGCPhysRsdt[iHpet] = GCPhysHpet + addend;
         aGCPhysXsdt[iHpet] = GCPhysHpet + addend;
@@ -3337 +3332 @@
     if (pThis->fUseMcfg)
     {
-        acpiR3SetupMcfg(pThis, GCPhysMcfg + addend);
+        acpiR3SetupMcfg(pDevIns, pThis, GCPhysMcfg + addend);
         aGCPhysRsdt[iMcfg] = GCPhysMcfg + addend;
         aGCPhysXsdt[iMcfg] = GCPhysMcfg + addend;
@@ -3344 +3339 @@
     {
         Assert(i < MAX_CUST_TABLES);
-        acpiR3PhysCopy(pThis, aGCPhysCust[i] + addend, pThis->apu8CustBin[i], pThis->acbCustBin[i]);
+        acpiR3PhysCopy(pDevIns, aGCPhysCust[i] + addend, pThis->apu8CustBin[i], pThis->acbCustBin[i]);
         aGCPhysRsdt[iCust + i] = aGCPhysCust[i] + addend;
         aGCPhysXsdt[iCust + i] = aGCPhysCust[i] + addend;
@@ -3352 +3347 @@
     }
 
-    acpiR3SetupSsdt(pThis, GCPhysSsdt + addend, pvSsdtCode, cbSsdt);
-    acpiCleanupSsdt(pThis->pDevInsR3, pvSsdtCode);
+    acpiR3SetupSsdt(pDevIns, GCPhysSsdt + addend, pvSsdtCode, cbSsdt);
+    acpiCleanupSsdt(pDevIns, pvSsdtCode);
     aGCPhysRsdt[iSsdt] = GCPhysSsdt + addend;
     aGCPhysXsdt[iSsdt] = GCPhysSsdt + addend;
 
-    rc = acpiR3SetupRsdt(pThis, GCPhysRsdt + addend, cAddr, aGCPhysRsdt);
+    rc = acpiR3SetupRsdt(pDevIns, pThis, GCPhysRsdt + addend, cAddr, aGCPhysRsdt);
     if (RT_FAILURE(rc))
         return rc;
-    return acpiR3SetupXsdt(pThis, GCPhysXsdt + addend, cAddr, aGCPhysXsdt);
+    return acpiR3SetupXsdt(pDevIns, pThis, GCPhysXsdt + addend, cAddr, aGCPhysXsdt);
 }
 
@@ -3421 +3416 @@
         }
 
-        int rc = acpiR3UpdateSMBusHandlers(pThis, NewIoPortBase);
+        int rc = acpiR3UpdateSMBusHandlers(pDevIns, pThis, NewIoPortBase);
         AssertRC(rc);
     }
@@ -3534 +3529 @@
     RT_NOREF1(enmCtx);
     PACPISTATE pThis = PDMDEVINS_2_DATA(pDevIns, PACPISTATE);
-    acpiR3PlantTables(pThis);
+    acpiR3PlantTables(pDevIns, pThis);
 }
 
@@ -3545 +3540 @@
 
     /* Play safe: make sure that the IRQ isn't stuck after a reset. */
-    acpiSetIrq(pThis, 0);
-
-    TMTimerLock(pThis->pPmTimerR3, VERR_IGNORED);
+    acpiSetIrq(pDevIns, 0);
+
+    PDMDevHlpTimerLock(pDevIns, pThis->hPmTimer, VERR_IGNORED);
     pThis->pm1a_en           = 0;
     pThis->pm1a_sts          = 0;
     pThis->pm1a_ctl          = 0;
-    pThis->u64PmTimerInitial = TMTimerGet(pThis->pPmTimerR3);
+    pThis->u64PmTimerInitial = PDMDevHlpTimerGet(pDevIns, pThis->hPmTimer);
     pThis->uPmTimerVal       = 0;
-    acpiR3PmTimerReset(pThis, pThis->u64PmTimerInitial);
+    acpiR3PmTimerReset(pDevIns, pThis, pThis->u64PmTimerInitial);
     pThis->uPmTimeOld        = pThis->uPmTimerVal;
     pThis->uBatteryIndex     = 0;
@@ -3560 +3555 @@
     pThis->gpe0_sts          = 0;
     pThis->uSleepState       = 0;
-    TMTimerUnlock(pThis->pPmTimerR3);
+    PDMDevHlpTimerUnlock(pDevIns, pThis->hPmTimer);
 
     /* Real device behavior is resetting only the PM controller state,
@@ -3570 +3565 @@
      * state. Real device behavior is only the SMBus controller state reset,
      * but we're additionally doing the job of the BIOS. */
-    acpiR3UpdateSMBusHandlers(pThis, SMB_PORT_BASE);
+    acpiR3UpdateSMBusHandlers(pDevIns, pThis, SMB_PORT_BASE);
     acpiR3SMBusPCIBIOSFake(pDevIns, pThis);
     acpiR3SMBusResetDevice(pThis);
-}
-
-/**
- * @interface_method_impl{PDMDEVREG,pfnRelocate}
- */
-static DECLCALLBACK(void) acpiR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
-{
-    PACPISTATE pThis = PDMDEVINS_2_DATA(pDevIns, PACPISTATE);
-    pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
-    pThis->pPmTimerRC = TMTimerRCPtr(pThis->pPmTimerR3);
-    NOREF(offDelta);
 }
 
@@ -3618 +3602 @@
     /** @todo move more of the code up! */
 
-    pThis->pDevIns   = pDevIns;
-    pThis->pDevInsR3 = pDevIns;
-    pThis->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
-    pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
+    pThis->pDevIns         = pDevIns;
     VMCPUSET_EMPTY(&pThis->CpuSetAttached);
     VMCPUSET_EMPTY(&pThis->CpuSetLocked);
@@ -3987 +3968 @@
     RTGCPHYS32 GCPhysRsdp = apicR3FindRsdpSpace();
     if (!GCPhysRsdp)
-        return PDMDEV_SET_ERROR(pDevIns, VERR_NO_MEMORY,
-                                N_("Can not find space for RSDP. ACPI is disabled"));
-
-    rc = acpiR3PlantTables(pThis);
+        return PDMDEV_SET_ERROR(pDevIns, VERR_NO_MEMORY, N_("Can not find space for RSDP. ACPI is disabled"));
+
+    rc = acpiR3PlantTables(pDevIns, pThis);
     AssertRCReturn(rc, rc);
 
@@ -4003 +3983 @@
     AssertRCReturn(rc, rc);
 
-    rc = acpiR3RegisterSMBusHandlers(pThis);
+    rc = acpiR3RegisterSMBusHandlers(pDevIns, pThis);
     AssertRCReturn(rc, rc);
 
@@ -4026 +4006 @@
      * Create the PM timer.
      */
-    PTMTIMER pTimer;
-    rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, acpiR3PmTimer, NULL /*pvUser*/,
-                                TMTIMER_FLAGS_NO_CRIT_SECT, "ACPI PM Timer", &pTimer);
+    rc = PDMDevHlpTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, acpiR3PmTimer, NULL /*pvUser*/,
+                              TMTIMER_FLAGS_NO_CRIT_SECT, "ACPI PM Timer", &pThis->hPmTimer);
     AssertRCReturn(rc, rc);
-    pThis->pPmTimerR3 = pTimer;
-    pThis->pPmTimerR0 = TMTimerR0Ptr(pTimer);
-    pThis->pPmTimerRC = TMTimerRCPtr(pTimer);
-
-    rc = TMTimerLock(pTimer, VERR_IGNORED);
+
+    rc = PDMDevHlpTimerLock(pDevIns, pThis->hPmTimer, VERR_IGNORED);
     AssertRCReturn(rc, rc);
-    pThis->u64PmTimerInitial = TMTimerGet(pTimer);
-    acpiR3PmTimerReset(pThis, pThis->u64PmTimerInitial);
-    TMTimerUnlock(pTimer);
+    pThis->u64PmTimerInitial = PDMDevHlpTimerGet(pDevIns, pThis->hPmTimer);
+    acpiR3PmTimerReset(pDevIns, pThis, pThis->u64PmTimerInitial);
+    PDMDevHlpTimerUnlock(pDevIns, pThis->hPmTimer);
 
     /*
@@ -4153 +4129 @@
     /* .pfnConstruct = */           acpiR3Construct,
     /* .pfnDestruct = */            acpiR3Destruct,
-    /* .pfnRelocate = */            acpiR3Relocate,
+    /* .pfnRelocate = */            NULL,
     /* .pfnMemSetup = */            acpiR3MemSetup,
     /* .pfnPowerOn = */             NULL,