vbox的更動 67579 路徑 trunk/src/VBox/Devices/Samples/DevPlayground.cpp

時間撮記:

2017-6-23 上午10:16:49 (7 年 以前)

作者:

vboxsync

訊息:

DevPlayground: make sure that the MMIO regions for the PCI functions have unique names, matching PGM assumptions

檔案:

• trunk/src/VBox/Devices/Samples/DevPlayground.cpp (修改) (2 筆差異)

trunk/src/VBox/Devices/Samples/DevPlayground.cpp

@@ -182 +182 @@
                                             devPlaygroundMap);
         AssertLogRelRCReturn(rc, rc);
+        char *pszRegionName = NULL;
+        RTStrAPrintf(&pszRegionName, "PG-F%d-BAR0", iPciFun);
+        Assert(pszRegionName);
         rc = PDMDevHlpMMIOExPreRegister(pDevIns, &pFun->PciDev, 0, cbFirst,
-                                        IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU, "PG-BAR0",
+                                        IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU, pszRegionName,
                                         NULL /*pvUser*/,  devPlaygroundMMIOWrite, devPlaygroundMMIORead, NULL /*pfnFill*/,
                                         NIL_RTR0PTR /*pvUserR0*/, NULL /*pszWriteR0*/, NULL /*pszReadR0*/, NULL /*pszFillR0*/,
@@ -196 +199 @@
                                             devPlaygroundMap);
         AssertLogRelRCReturn(rc, rc);
+        pszRegionName = NULL;
+        RTStrAPrintf(&pszRegionName, "PG-F%d-BAR2", iPciFun);
+        Assert(pszRegionName);
         rc = PDMDevHlpMMIOExPreRegister(pDevIns, &pFun->PciDev, 2, cbSecond,
-                                        IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU, "PG-BAR2",
+                                        IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU, pszRegionName,
                                         NULL /*pvUser*/,  devPlaygroundMMIOWrite, devPlaygroundMMIORead, NULL /*pfnFill*/,
                                         NIL_RTR0PTR /*pvUserR0*/, NULL /*pszWriteR0*/, NULL /*pszReadR0*/, NULL /*pszFillR0*/,