Changeset 59248 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Jan 4, 2016 2:13:22 PM (9 years ago)

Author:

vboxsync

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

104877

Message:

Storage: Get rid of the block driver and merge the the little extra functionality it had into the VD driver. Enables us to get rid of PDMIBLOCK which is basically a subset of PDMIMEDIA and makes changes to the latter interface tedious because it had to be replicated in the former. (bugref:4114)

File:

• trunk/src/VBox/Devices/PC/DevPcBios.cpp (modified) (14 diffs)

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

@@ -291 +291 @@
  * @param   pLCHSGeometry   Where to return the disk geometry on success
  */
-static int biosGuessDiskLCHS(PPDMIBLOCK pBlock, PPDMMEDIAGEOMETRY pLCHSGeometry)
+static int biosGuessDiskLCHS(PPDMIMEDIA pMedia, PPDMMEDIAGEOMETRY pLCHSGeometry)
 {
     uint8_t aMBR[512], *p;
@@ -297 +297 @@
     uint32_t iEndHead, iEndSector, cLCHSCylinders, cLCHSHeads, cLCHSSectors;
 
-    if (!pBlock)
+    if (!pMedia)
         return VERR_INVALID_PARAMETER;
-    rc = pBlock->pfnReadPcBios(pBlock, 0, aMBR, sizeof(aMBR));
+    rc = pMedia->pfnReadPcBios(pMedia, 0, aMBR, sizeof(aMBR));
     if (RT_FAILURE(rc))
         return rc;
@@ -316 +316 @@
             cLCHSHeads = iEndHead + 1;
             cLCHSSectors = iEndSector;
-            cLCHSCylinders = RT_MIN(1024, pBlock->pfnGetSize(pBlock) / (512 * cLCHSHeads * cLCHSSectors));
+            cLCHSCylinders = RT_MIN(1024, pMedia->pfnGetSize(pMedia) / (512 * cLCHSHeads * cLCHSSectors));
             if (cLCHSCylinders >= 1)
             {
@@ -397 +397 @@
  * @param   pLCHSGeometry Where to store the geometry settings.
  */
-static int setLogicalDiskGeometry(PPDMIBASE pBase, PPDMIBLOCKBIOS pHardDisk, PPDMMEDIAGEOMETRY pLCHSGeometry)
+static int setLogicalDiskGeometry(PPDMIBASE pBase, PPDMIMEDIA pHardDisk, PPDMMEDIAGEOMETRY pLCHSGeometry)
 {
     PDMMEDIAGEOMETRY LCHSGeometry;
     int rc = VINF_SUCCESS;
 
-    rc = pHardDisk->pfnGetLCHSGeometry(pHardDisk, &LCHSGeometry);
+    rc = pHardDisk->pfnBiosGetLCHSGeometry(pHardDisk, &LCHSGeometry);
     if (   rc == VERR_PDM_GEOMETRY_NOT_SET
         || LCHSGeometry.cCylinders == 0
@@ -410 +410 @@
         || LCHSGeometry.cSectors > 63)
     {
-        PPDMIBLOCK pBlock;
-        pBlock = PDMIBASE_QUERY_INTERFACE(pBase, PDMIBLOCK);
         /* No LCHS geometry, autodetect and set. */
-        rc = biosGuessDiskLCHS(pBlock, &LCHSGeometry);
+        rc = biosGuessDiskLCHS(pHardDisk, &LCHSGeometry);
         if (RT_FAILURE(rc))
         {
             /* Try if PCHS geometry works, otherwise fall back. */
-            rc = pHardDisk->pfnGetPCHSGeometry(pHardDisk, &LCHSGeometry);
+            rc = pHardDisk->pfnBiosGetPCHSGeometry(pHardDisk, &LCHSGeometry);
         }
         if (   RT_FAILURE(rc)
@@ -427 +425 @@
             || LCHSGeometry.cSectors > 63)
         {
-            uint64_t cSectors = pBlock->pfnGetSize(pBlock) / 512;
+            uint64_t cSectors = pHardDisk->pfnGetSize(pHardDisk) / 512;
             if (cSectors / 16 / 63 <= 1024)
             {
@@ -456 +454 @@
 
         }
-        rc = pHardDisk->pfnSetLCHSGeometry(pHardDisk, &LCHSGeometry);
+        rc = pHardDisk->pfnBiosSetLCHSGeometry(pHardDisk, &LCHSGeometry);
         if (rc == VERR_VD_IMAGE_READ_ONLY)
         {
@@ -483 +481 @@
  * @param   pLCHSGeometry Where to store the geometry settings.
  */
-static int getLogicalDiskGeometry(PPDMIBLOCKBIOS pHardDisk, PPDMMEDIAGEOMETRY pLCHSGeometry)
+static int getLogicalDiskGeometry(PPDMIMEDIA pHardDisk, PPDMMEDIAGEOMETRY pLCHSGeometry)
 {
     PDMMEDIAGEOMETRY LCHSGeometry;
     int rc = VINF_SUCCESS;
 
-    rc = pHardDisk->pfnGetLCHSGeometry(pHardDisk, &LCHSGeometry);
+    rc = pHardDisk->pfnBiosGetLCHSGeometry(pHardDisk, &LCHSGeometry);
     if (   rc == VERR_PDM_GEOMETRY_NOT_SET
         || LCHSGeometry.cCylinders == 0
@@ -549 +547 @@
     unsigned        i;
     PUVM            pUVM = PDMDevHlpGetUVM(pDevIns); AssertRelease(pUVM);
-    PPDMIBLOCKBIOS  apHDs[4] = {0};
+    PPDMIMEDIA      apHDs[4] = {0};
     LogFlow(("pcbiosInitComplete:\n"));
 
@@ -642 +640 @@
         if (RT_SUCCESS(rc))
         {
-            PPDMIBLOCKBIOS pFD = PDMIBASE_QUERY_INTERFACE(pBase, PDMIBLOCKBIOS);
+            PPDMIMEDIA pFD = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIA);
             if (pFD)
             {
@@ -649 +647 @@
                 switch (pFD->pfnGetType(pFD))
                 {
-                    case PDMBLOCKTYPE_FLOPPY_360:       u32 |= 1  << cShift; break;
-                    case PDMBLOCKTYPE_FLOPPY_1_20:      u32 |= 2  << cShift; break;
-                    case PDMBLOCKTYPE_FLOPPY_720:       u32 |= 3  << cShift; break;
-                    case PDMBLOCKTYPE_FLOPPY_1_44:      u32 |= 4  << cShift; break;
-                    case PDMBLOCKTYPE_FLOPPY_2_88:      u32 |= 5  << cShift; break;
-                    case PDMBLOCKTYPE_FLOPPY_FAKE_15_6: u32 |= 14 << cShift; break;
-                    case PDMBLOCKTYPE_FLOPPY_FAKE_63_5: u32 |= 15 << cShift; break;
+                    case PDMMEDIATYPE_FLOPPY_360:       u32 |= 1  << cShift; break;
+                    case PDMMEDIATYPE_FLOPPY_1_20:      u32 |= 2  << cShift; break;
+                    case PDMMEDIATYPE_FLOPPY_720:       u32 |= 3  << cShift; break;
+                    case PDMMEDIATYPE_FLOPPY_1_44:      u32 |= 4  << cShift; break;
+                    case PDMMEDIATYPE_FLOPPY_2_88:      u32 |= 5  << cShift; break;
+                    case PDMMEDIATYPE_FLOPPY_FAKE_15_6: u32 |= 14 << cShift; break;
+                    case PDMMEDIATYPE_FLOPPY_FAKE_63_5: u32 |= 15 << cShift; break;
                     default:                        AssertFailed(); break;
                 }
@@ -683 +681 @@
         int rc = PDMR3QueryLun(pUVM, pThis->pszHDDevice, 0, i, &pBase);
         if (RT_SUCCESS(rc))
-            apHDs[i] = PDMIBASE_QUERY_INTERFACE(pBase, PDMIBLOCKBIOS);
+            apHDs[i] = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIA);
         if (   apHDs[i]
-            && (   apHDs[i]->pfnGetType(apHDs[i]) != PDMBLOCKTYPE_HARD_DISK
-                || !apHDs[i]->pfnIsVisible(apHDs[i])))
+            && (   apHDs[i]->pfnGetType(apHDs[i]) != PDMMEDIATYPE_HARD_DISK
+                || !apHDs[i]->pfnBiosIsVisible(apHDs[i])))
             apHDs[i] = NULL;
         if (apHDs[i])
@@ -744 +742 @@
             int rc = PDMR3QueryLun(pUVM, pThis->pszSataDevice, 0, pThis->iSataHDLUN[i], &pBase);
             if (RT_SUCCESS(rc))
-                apHDs[i] = PDMIBASE_QUERY_INTERFACE(pBase, PDMIBLOCKBIOS);
+                apHDs[i] = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIA);
             if (   apHDs[i]
-                && (   apHDs[i]->pfnGetType(apHDs[i]) != PDMBLOCKTYPE_HARD_DISK
-                    || !apHDs[i]->pfnIsVisible(apHDs[i])))
+                && (   apHDs[i]->pfnGetType(apHDs[i]) != PDMMEDIATYPE_HARD_DISK
+                    || !apHDs[i]->pfnBiosIsVisible(apHDs[i])))
                 apHDs[i] = NULL;
             if (apHDs[i])
@@ -798 +796 @@
             int rc = PDMR3QueryLun(pUVM, pThis->pszScsiDevice, 0, pThis->iScsiHDLUN[i], &pBase);
             if (RT_SUCCESS(rc))
-                apHDs[i] = PDMIBASE_QUERY_INTERFACE(pBase, PDMIBLOCKBIOS);
+                apHDs[i] = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIA);
             if (   apHDs[i]
-                && (   apHDs[i]->pfnGetType(apHDs[i]) != PDMBLOCKTYPE_HARD_DISK
-                    || !apHDs[i]->pfnIsVisible(apHDs[i])))
+                && (   apHDs[i]->pfnGetType(apHDs[i]) != PDMMEDIATYPE_HARD_DISK
+                    || !apHDs[i]->pfnBiosIsVisible(apHDs[i])))
                 apHDs[i] = NULL;
             if (apHDs[i])