Changeset 64725 in vbox

Timestamp:

Nov 20, 2016 10:33:04 PM (8 years ago)

Author:

vboxsync

Message:

Storage/DrvRamDisk: Fixes

File:

• trunk/src/VBox/Devices/Storage/DrvRamDisk.cpp (modified) (7 diffs)

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

@@ -177 +177 @@
     /** Flag whether the RAM disk was pre allocated. */
     bool                    fPreallocRamDisk;
+    /** Flag whether to report a non totating medium. */
+    bool                    fNonRotational;
     /** AVL tree containing the disk blocks to check. */
     PAVLRFOFFTREE           pTreeSegments;
@@ -638 +640 @@
 }
 
+/** @interface_method_impl{PDMIMEDIA,pfnIsNonRotational} */
+static DECLCALLBACK(bool) drvramdiskIsNonRotational(PPDMIMEDIA pInterface)
+{
+    PDRVRAMDISK pThis = RT_FROM_MEMBER(pInterface, DRVRAMDISK, IMedia);
+    return pThis->fNonRotational;
+}
+
 
 /*********************************************************************************************************************************
@@ -1132 +1141 @@
 
 /**
+ * @interface_method_impl{PDMIMEDIAEX,pfnQueryFeatures}
+ */
+static DECLCALLBACK(int) drvramdiskQueryFeatures(PPDMIMEDIAEX pInterface, uint32_t *pfFeatures)
+{
+    RT_NOREF1(pInterface)
+    *pfFeatures = PDMIMEDIAEX_FEATURE_F_ASYNC | PDMIMEDIAEX_FEATURE_F_DISCARD;
+    return VINF_SUCCESS;
+}
+
+
+/**
  * @interface_method_impl{PDMIMEDIAEX,pfnIoReqAllocSizeSet}
  */
@@ -1209 +1229 @@
     RTMemCacheFree(pThis->hIoReqCache, pIoReq);
     return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{PDMIMEDIAEX,pfnIoReqQueryResidual}
+ */
+static DECLCALLBACK(int) drvramdiskIoReqQueryResidual(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq, size_t *pcbResidual)
+{
+    RT_NOREF2(pInterface, hIoReq);
+
+    *pcbResidual = 0;
+    return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{PDMIMEDIAEX,pfnIoReqQueryXferSize}
+ */
+static DECLCALLBACK(int) drvramdiskIoReqQueryXferSize(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq, size_t *pcbXfer)
+{
+    RT_NOREF1(pInterface);
+    PPDMMEDIAEXIOREQINT pIoReq = hIoReq;
+
+    if (   pIoReq->enmType == PDMMEDIAEXIOREQTYPE_READ
+        || pIoReq->enmType == PDMMEDIAEXIOREQTYPE_WRITE)
+        *pcbXfer = pIoReq->ReadWrite.cbReq;
+    else
+        *pcbXfer = 0;
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{PDMIMEDIAEX,pfnIoReqCancelAll}
+ */
+static DECLCALLBACK(int) drvramdiskIoReqCancelAll(PPDMIMEDIAEX pInterface)
+{
+    RT_NOREF1(pInterface);
+    return VINF_SUCCESS; /** @todo */
 }
 
@@ -1600 +1657 @@
                                     "PreAlloc\0"
                                     "IoBufMax\0"
-                                    "SectorSize\0"))
+                                    "SectorSize\0"
+                                    "NonRotational\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
 
@@ -1608 +1666 @@
                                 N_("RamDisk: Error querying the media size"));
     rc = CFGMR3QueryBoolDef(pCfg, "PreAlloc", &pThis->fPreallocRamDisk, false);
-    AssertRC(rc);
+    if (RT_FAILURE(rc))
+        return PDMDRV_SET_ERROR(pDrvIns, rc,
+                                N_("RamDisk: Error querying \"PreAlloc\""));
+    rc = CFGMR3QueryBoolDef(pCfg, "NonRotational", &pThis->fNonRotational, true);
+    if (RT_FAILURE(rc))
+        return PDMDRV_SET_ERROR(pDrvIns, rc,
+                                N_("RamDisk: Error querying \"NonRotational\""));
     rc = CFGMR3QueryU32Def(pCfg, "IoBufMax", &cbIoBufMax, 5 * _1M);
     if (RT_FAILURE(rc))
@@ -1640 +1704 @@
     pThis->IMedia.pfnReadPcBios          = drvramdiskReadPcBios;
     pThis->IMedia.pfnDiscard             = drvramdiskDiscard;
+    pThis->IMedia.pfnIsNonRotational     = drvramdiskIsNonRotational;
 
     /* IMediaEx */
+    pThis->IMediaEx.pfnQueryFeatures            = drvramdiskQueryFeatures;
     pThis->IMediaEx.pfnIoReqAllocSizeSet        = drvramdiskIoReqAllocSizeSet;
     pThis->IMediaEx.pfnIoReqAlloc               = drvramdiskIoReqAlloc;
     pThis->IMediaEx.pfnIoReqFree                = drvramdiskIoReqFree;
+    pThis->IMediaEx.pfnIoReqQueryResidual       = drvramdiskIoReqQueryResidual;
+    pThis->IMediaEx.pfnIoReqQueryXferSize       = drvramdiskIoReqQueryXferSize;
+    pThis->IMediaEx.pfnIoReqCancelAll           = drvramdiskIoReqCancelAll;
     pThis->IMediaEx.pfnIoReqCancel              = drvramdiskIoReqCancel;
     pThis->IMediaEx.pfnIoReqRead                = drvramdiskIoReqRead;