Changeset 64093 in vbox

Timestamp:

Sep 29, 2016 3:39:23 PM (8 years ago)

Author:

vboxsync

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

111048

Message:

Storage: Move the NonRotationalMedium property from the devices and SCSI driver down to the media access driver (VD, HostDVD or HostFloppy) and add callback to PDMIMEDIA to query the flag

Location:

trunk

Files:

• include/VBox/vmm/pdmstorageifs.h (modified) (2 diffs)
• src/VBox/Devices/Storage/DevAHCI.cpp (modified) (5 diffs)
• src/VBox/Devices/Storage/DevATA.cpp (modified) (4 diffs)
• src/VBox/Devices/Storage/DrvHostBase.cpp (modified) (2 diffs)
• src/VBox/Devices/Storage/DrvSCSI.cpp (modified) (3 diffs)
• src/VBox/Devices/Storage/DrvVD.cpp (modified) (5 diffs)
• src/VBox/Main/include/ConsoleImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (6 diffs)

trunk/include/VBox/vmm/pdmstorageifs.h

@@ -354 +354 @@
 
     /**
+     * Returns whether the medium should be marked as rotational or not.
+     *
+     * @returns true if non rotating medium.
+     * @returns false if rotating medium.
+     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @thread  Any thread.
+     */
+    DECLR3CALLBACKMEMBER(bool, pfnIsNonRotational,(PPDMIMEDIA pInterface));
+
+    /**
      * Get stored media geometry (physical CHS, PCHS) - BIOS property.
      * This is an optional feature of a media.
@@ -449 +459 @@
 } PDMIMEDIA;
 /** PDMIMEDIA interface ID. */
-#define PDMIMEDIA_IID                           "855b4998-0cd2-45d8-8da3-fe9a47504abb"
+#define PDMIMEDIA_IID                           "d344aeaa-3ad0-4563-bb03-2733383e9230"
 
 

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

@@ -373 +373 @@
     /** First D2H FIS was send. */
     bool                            fFirstD2HFisSend;
-    /** Mark the drive as having a non-rotational medium (i.e. as a SSD). */
-    bool                            fNonRotational;
     /** Attached device is a CD/DVD drive. */
     bool                            fATAPI;
@@ -392 +390 @@
     volatile bool                   fWrkThreadSleeping;
 
-    bool                            afAlignment[3];
+    bool                            afAlignment[4];
 
     /** Number of total sectors. */
@@ -3085 +3083 @@
     if (   pAhciPort->fTrimEnabled
         || pAhciPort->cbSector != 512
-        || pAhciPort->fNonRotational)
+        || pAhciPort->pDrvMedia->pfnIsNonRotational(pAhciPort->pDrvMedia))
     {
         p[80] = RT_H2LE_U16(0x1f0); /* support everything up to ATA/ATAPI-8 ACS */
@@ -3121 +3119 @@
     }
 
-    if (pAhciPort->fNonRotational)
+    if (pAhciPort->pDrvMedia->pfnIsNonRotational(pAhciPort->pDrvMedia))
         p[217] = RT_H2LE_U16(1); /* Non-rotational medium */
 
@@ -7677 +7675 @@
     }
 
-    rc = CFGMR3QueryBoolDef(pCfgNode, "NonRotationalMedium", &pAhciPort->fNonRotational, false);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                    N_("AHCI configuration error: failed to read \"NonRotationalMedium\" as boolean"));
-
     rc = CFGMR3QueryU8Def(pCfgNode, "LogicalSectorsPerPhysical", &pAhciPort->cLogSectorsPerPhysicalExp, 0);
     if (RT_FAILURE(rc))

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

@@ -261 +261 @@
     STAMPROFILE     StatFlushes;
 
-    /** Mark the drive as having a non-rotational medium (i.e. as a SSD). */
-    bool            fNonRotational;
     /** Enable passing through commands directly to the ATAPI drive. */
     bool            fATAPIPassthrough;
@@ -1296 +1294 @@
     if (   s->pDrvMedia->pfnDiscard
         || s->cbSector != 512
-        || s->fNonRotational)
+        || s->pDrvMedia->pfnIsNonRotational(s->pDrvMedia))
     {
         p[80] = RT_H2LE_U16(0x1f0); /* support everything up to ATA/ATAPI-8 ACS */
@@ -1339 +1337 @@
     if (s->pDrvMedia->pfnDiscard) /** @todo Set bit 14 in word 69 too? (Deterministic read after TRIM). */
         p[169] = RT_H2LE_U16(1); /* DATA SET MANAGEMENT command supported. */
-    if (s->fNonRotational)
+    if (s->pDrvMedia->pfnIsNonRotational(s->pDrvMedia))
         p[217] = RT_H2LE_U16(1); /* Non-rotational medium */
     uint32_t uCsum = ataR3Checksum(p, 510);
@@ -7760 +7758 @@
                     }
 
-                    rc = CFGMR3QueryBoolDef(pCfgNode, "NonRotationalMedium", &pIf->fNonRotational, false);
-                    if (RT_FAILURE(rc))
-                        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                    N_("PIIX3 configuration error: failed to read \"NonRotationalMedium\" as boolean"));
-
                     /* There are three other identification strings for CD drives used for INQUIRY */
                     if (pIf->fATAPI)

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

@@ -288 +288 @@
     PDRVHOSTBASE pThis = PDMIMEDIA_2_DRVHOSTBASE(pInterface);
     return pThis->fReadOnly;
+}
+
+
+/** @interface_method_impl{PDMIMEDIA,pfnIsNonRotational} */
+static DECLCALLBACK(bool) drvHostBaseIsNonRotational(PPDMIMEDIA pInterface)
+{
+    RT_NOREF1(pInterface);
+    return false;
 }
 
@@ -1874 +1882 @@
     pThis->IMedia.pfnFlush                  = drvHostBaseFlush;
     pThis->IMedia.pfnIsReadOnly             = drvHostBaseIsReadOnly;
+    pThis->IMedia.pfnIsNonRotational        = drvHostBaseIsNonRotational;
     pThis->IMedia.pfnGetSize                = drvHostBaseGetSize;
     pThis->IMedia.pfnGetType                = drvHostBaseGetType;

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

@@ -125 +125 @@
     /** Errors printed in the release log. */
     unsigned                cErrors;
-    /** Mark the drive as having a non-rotational medium (i.e. as a SSD). */
-    bool                    fNonRotational;
     /** Medium is readonly */
     bool                    fReadonly;
@@ -377 +375 @@
         *pfFeatures |= VSCSI_LUN_FEATURE_UNMAP;
 
-    if (pThis->fNonRotational)
+    if (   pThis->pDrvMedia
+        && pThis->pDrvMedia->pfnIsNonRotational(pThis->pDrvMedia))
         *pfFeatures |= VSCSI_LUN_FEATURE_NON_ROTATIONAL;
 
@@ -1117 +1116 @@
      * Validate and read configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "NonRotationalMedium\0Readonly\0"))
+    if (!CFGMR3AreValuesValid(pCfg, "Readonly\0"))
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("SCSI configuration error: unknown option specified"));
-
-    rc = CFGMR3QueryBoolDef(pCfg, "NonRotationalMedium", &pThis->fNonRotational, false);
-    if (RT_FAILURE(rc))
-        return PDMDRV_SET_ERROR(pDrvIns, rc,
-                    N_("SCSI configuration error: failed to read \"NonRotationalMedium\" as boolean"));
 
     rc = CFGMR3QueryBoolDef(pCfg, "Readonly", &pThis->fReadonly, false);

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

@@ -323 +323 @@
     /** Visible to the BIOS. */
     bool                    fBiosVisible;
+    /** Flag whether this medium should be presented as non rotational. */
+    bool                    fNonRotational;
 #ifdef VBOX_PERIODIC_FLUSH
     /** HACK: Configuration value for number of bytes written after which to flush. */
@@ -2187 +2189 @@
 }
 
+/** @interface_method_impl{PDMIMEDIA,pfnIsNonRotational} */
+static DECLCALLBACK(bool) drvvdIsNonRotational(PPDMIMEDIA pInterface)
+{
+    LogFlowFunc(("\n"));
+    PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
+
+    return pThis->fNonRotational;
+}
+
 /** @interface_method_impl{PDMIMEDIA,pfnBiosGetPCHSGeometry} */
 static DECLCALLBACK(int) drvvdBiosGetPCHSGeometry(PPDMIMEDIA pInterface,
@@ -4354 +4365 @@
     pThis->IMedia.pfnGetSectorSize      = drvvdGetSectorSize;
     pThis->IMedia.pfnIsReadOnly         = drvvdIsReadOnly;
+    pThis->IMedia.pfnIsNonRotational     = drvvdIsNonRotational;
     pThis->IMedia.pfnBiosGetPCHSGeometry = drvvdBiosGetPCHSGeometry;
     pThis->IMedia.pfnBiosSetPCHSGeometry = drvvdBiosSetPCHSGeometry;
@@ -4474 +4486 @@
                                           "SkipConsistencyChecks\0"
                                           "Locked\0BIOSVisible\0Cylinders\0Heads\0Sectors\0Mountable\0"
-                                          "EmptyDrive\0IoBufMax\0"
+                                          "EmptyDrive\0IoBufMax\0NonRotationalMedium\0"
 #if defined(VBOX_PERIODIC_FLUSH) || defined(VBOX_IGNORE_FLUSH)
                                           "FlushInterval\0IgnoreFlush\0IgnoreFlushAsync\0"
@@ -4748 +4760 @@
             if (RT_FAILURE(rc))
                 return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"IoBufMax\" from the config"));
+
+            rc = CFGMR3QueryBoolDef(pCfg, "NonRotationalMedium", &pThis->fNonRotational, false);
+            if (RT_FAILURE(rc))
+                return PDMDRV_SET_ERROR(pDrvIns, rc,
+                                        N_("DrvVD configuration error: Querying \"NonRotationalMedium\" as boolean failed"));
         }
 

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -646 +646 @@
                        const char *pcszBwGroup,
                        bool fDiscard,
+                       bool fNonRotational,
                        IMedium *pMedium,
                        MachineState_T aMachineState,

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -265 +265 @@
 # endif
 #endif
-
-static const char *const g_apszIDEDrives[4] =
-    { "PrimaryMaster", "PrimarySlave", "SecondaryMaster", "SecondarySlave" };
 
 class ConfigError : public RTCError
@@ -3925 +3922 @@
             *ppLunL0 = pLunL0;
 
-        PCFGMNODE pCfg = CFGMR3GetChild(pCtlInst, "Config");
-        if (pCfg)
-        {
-            if (!strcmp(pcszDevice, "piix3ide"))
-            {
-                PCFGMNODE pDrive = CFGMR3GetChild(pCfg, g_apszIDEDrives[uLUN]);
-                if (!pDrive)
-                    InsertConfigNode(pCfg, g_apszIDEDrives[uLUN], &pDrive);
-                /* Don't use the RemoveConfigValue wrapper above, as we don't
-                 * know if the leaf is present or not. */
-                CFGMR3RemoveValue(pDrive,  "NonRotationalMedium");
-                InsertConfigInteger(pDrive, "NonRotationalMedium", !!fNonRotational);
-            }
-            else if (!strcmp(pcszDevice, "ahci"))
-            {
-                Utf8Str strPort = Utf8StrFmt("Port%u", uLUN);
-                PCFGMNODE pDrive = CFGMR3GetChild(pCfg, strPort.c_str());
-                if (!pDrive)
-                    InsertConfigNode(pCfg, strPort.c_str(), &pDrive);
-                /* Don't use the RemoveConfigValue wrapper above, as we don't
-                 * know if the leaf is present or not. */
-                CFGMR3RemoveValue(pDrive,  "NonRotationalMedium");
-                InsertConfigInteger(pDrive, "NonRotationalMedium", !!fNonRotational);
-            }
-        }
-
         Utf8Str devicePath = Utf8StrFmt("%s/%u/LUN#%u", pcszDevice, uInstance, uLUN);
         mapMediumAttachments[devicePath] = pMediumAtt;
@@ -3958 +3929 @@
         {
             InsertConfigString(pLunL0, "Driver", "SCSI");
-            PCFGMNODE pL1Cfg = NULL;
-            InsertConfigNode(pLunL0, "Config", &pL1Cfg);
-            InsertConfigInteger(pL1Cfg, "NonRotationalMedium", !!fNonRotational);
-
             InsertConfigNode(pLunL0, "AttachedDriver", &pLunL0);
         }
@@ -4196 +4163 @@
                             strBwGroup.isEmpty() ? NULL : Utf8Str(strBwGroup).c_str(),
                             !!fDiscard,
+                            !!fNonRotational,
                             pMedium,
                             aMachineState,
@@ -4275 +4243 @@
                             const char *pcszBwGroup,
                             bool fDiscard,
+                            bool fNonRotational,
                             IMedium *pMedium,
                             MachineState_T aMachineState,
@@ -4464 +4433 @@
                 if (fDiscard)
                     InsertConfigInteger(pCfg, "Discard", 1);
+
+                if (fNonRotational)
+                    InsertConfigInteger(pCfg, "NonRotationalMedium", 1);
 
                 /* Pass all custom parameters. */