Changeset 64846 in vbox

Timestamp:

Dec 12, 2016 10:27:26 PM (8 years ago)

Author:

vboxsync

Message:

Devices/Storage/DevFdc: Add missing pfnQueryDeviceLocation, fixes crash after recent changes in the medium driver

File:

• trunk/src/VBox/Devices/Storage/DevFdc.cpp (modified) (3 diffs)

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

@@ -141 +141 @@
     BlockDriverState *bs;
 #else /* VBOX */
+    /** Pointer to the owning device instance. */
+    R3PTRTYPE(PPDMDEVINS)           pDevIns;
     /** Pointer to the attached driver's base interface. */
     R3PTRTYPE(PPDMIBASE)            pDrvBase;
@@ -2669 +2671 @@
 
 
+/**
+ * @interface_method_impl{PDMIMEDIAPORT,pfnQueryDeviceLocation}
+ */
+static DECLCALLBACK(int) fdQueryDeviceLocation(PPDMIMEDIAPORT pInterface, const char **ppcszController,
+                                               uint32_t *piInstance, uint32_t *piLUN)
+{
+    fdrive_t *pDrv = RT_FROM_MEMBER(pInterface, fdrive_t, IPort);
+    PPDMDEVINS pDevIns = pDrv->pDevIns;
+
+    AssertPtrReturn(ppcszController, VERR_INVALID_POINTER);
+    AssertPtrReturn(piInstance, VERR_INVALID_POINTER);
+    AssertPtrReturn(piLUN, VERR_INVALID_POINTER);
+
+    *ppcszController = pDevIns->pReg->szName;
+    *piInstance = pDevIns->iInstance;
+    *piLUN = pDrv->iLUN;
+
+    return VINF_SUCCESS;
+}
+
 /* -=-=-=-=-=-=-=-=- Controller level interfaces -=-=-=-=-=-=-=-=- */
 
@@ -2927 +2949 @@
         fdrive_t *pDrv = &pThis->drives[i];
 
-        pDrv->drive = FDRIVE_DRV_NONE;
-        pDrv->iLUN = i;
+        pDrv->drive   = FDRIVE_DRV_NONE;
+        pDrv->iLUN    = i;
+        pDrv->pDevIns = pDevIns;
 
         pDrv->IBase.pfnQueryInterface       = fdQueryInterface;
         pDrv->IMountNotify.pfnMountNotify   = fdMountNotify;
         pDrv->IMountNotify.pfnUnmountNotify = fdUnmountNotify;
+        pDrv->IPort.pfnQueryDeviceLocation  = fdQueryDeviceLocation;
         pDrv->Led.u32Magic = PDMLED_MAGIC;
     }