Changeset 77300 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 13, 2019 1:59:41 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128820

Message:

DevVGA,PCI,PGM: Hacks for making it possible to load saved states of the VBoxSVGA device with the 'wrong' BAR layout. bugref:9359

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (3 diffs)

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

@@ -1234 +1234 @@
 
 /**
+ * @callback_method_impl{FNPCIIOREGIONSWAP}
+ */
+static DECLCALLBACK(int) devpciR3CommonRestoreSwapRegions(PPDMPCIDEV pPciDev, uint32_t iRegion, uint32_t iOtherRegion)
+{
+    AssertReturn(iRegion < iOtherRegion, VERR_INVALID_PARAMETER);
+    AssertLogRelReturn(iOtherRegion < RT_ELEMENTS(pPciDev->Int.s.aIORegions), VERR_INVALID_PARAMETER);
+    AssertReturn(pPciDev->Int.s.bPadding0 == (0xe0 | (uint8_t)iRegion), VERR_INVALID_PARAMETER);
+
+    PCIIOREGION Tmp = pPciDev->Int.s.aIORegions[iRegion];
+    pPciDev->Int.s.aIORegions[iRegion] = pPciDev->Int.s.aIORegions[iOtherRegion];
+    pPciDev->Int.s.aIORegions[iOtherRegion] = Tmp;
+
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Checks for and deals with changes in resource sizes and types.
  *
@@ -1260 +1277 @@
                 if (pPciDev->pfnRegionLoadChangeHookR3)
                 {
+                    pPciDev->Int.s.bPadding0 = 0xe0 | (uint8_t)iRegion;
                     rc = pPciDev->pfnRegionLoadChangeHookR3(pPciDev->Int.s.pDevInsR3, pPciDev, iRegion, paIoRegions[iRegion].size,
-                                                            (PCIADDRESSSPACE)paIoRegions[iRegion].type, NULL /*pfnOldSetter*/);
+                                                            (PCIADDRESSSPACE)paIoRegions[iRegion].type, NULL /*pfnOldSetter*/,
+                                                            devpciR3CommonRestoreSwapRegions);
+                    pPciDev->Int.s.bPadding0 = 0;
                     if (RT_FAILURE(rc))
                         return SSMR3SetLoadError(pSSM, rc, RT_SRC_POS,
@@ -1279 +1299 @@
     {
         rc = pPciDev->pfnRegionLoadChangeHookR3(pPciDev->Int.s.pDevInsR3, pPciDev, UINT32_MAX, RTGCPHYS_MAX, (PCIADDRESSSPACE)-1,
-                                                devpciR3CommonRestoreOldSetRegion);
+                                                devpciR3CommonRestoreOldSetRegion, NULL);
         if (RT_FAILURE(rc))
             return SSMR3SetLoadError(pSSM, rc, RT_SRC_POS,  N_("Device %s/%u failed to resize its resources: %Rrc"),