Changeset 79973 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Jul 25, 2019 8:10:25 AM (6 years ago)

Author:

vboxsync

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

132404

Message:

Just checking in changes. Working out new interface between Virtio_1.0.cpp and its clients. Currently crashing in DrvSCSI construct (that was working when it was all contained in DevVirtioScsi). Next thing to troubleshoot.

File:

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

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

@@ -55 +55 @@
 typedef struct VIRTIOSCSITARGET
 {
-
-
-    /** Pointer to the owning virtioScsi device instance. - R3 pointer */
+    /** Pointer to PCI device that owns this target instance. - R3 /pointer */
     R3PTRTYPE(struct VIRTIOSCSI *)  pVirtioScsiR3;
-    /** Pointer to the owning virtioScsi device instance. - R0 pointer */
+    /** Pointer to PCI device that owns this target instance. - R0 pointer */
     R3PTRTYPE(struct VIRTIOSCSI *)  pVirtioScsiR0;
-    /** Pointer to the owning virtioScsi device instance. - RC pointer */
+    /** Pointer to PCI device that owns this target instance. - RC pointer */
     R3PTRTYPE(struct VIRTIOSCSI *)  pVirtioScsiRC;
 
@@ -108 +106 @@
 typedef struct VIRTIOSCSI
 {
+    /* virtioState must be first member */
+    VIRTIOSTATE                     virtioState;
+
+    /* SCSI target instances data */
+    VIRTIOSCSITARGET                aTargetInstances[VIRTIOSCSI_MAX_TARGETS];
 
     PPDMDEVINSR3           pDevInsR3;              /**< Device instance - R3. */
     PPDMDEVINSR0           pDevInsR0;              /**< Device instance - R0. */
     PPDMDEVINSRC           pDevInsRC;              /**< Device instance - RC. */
-
-    /* virtioState must be first member */
-    VIRTIOSTATE                     virtioState;
-
-    /* SCSI target instances data */
-    VIRTIOSCSITARGET                aTargetInstances[VIRTIOSCSI_MAX_TARGETS];
-
-    /** Base address of the I/O ports. */
-    RTIOPORT                        IOPortBase;
 
     /** Base address of the memory mapping. */
@@ -766 +760 @@
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMEDIAPORT, &pTarget->IMediaPort);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMEDIAEXPORT, &pTarget->IMediaExPort);
+
+    /* This call back is necessary to get Status / LED support */
+    return virtioQueryInterface(pInterface, pszIID);
+
     return NULL;
 }
@@ -867 +865 @@
     pVirtioPciParams->uInterruptPin  = 0x01;
 
-
-    PVIRTIOSTATE pVirtioScsi = &(pThis->virtioState);
-    rc = virtioConstruct(pDevIns, pVirtioScsi, iInstance, pVirtioPciParams,
+    PVIRTIOSTATE pVirtio = &(pThis->virtioState);
+    pDevIns->IBase.pfnQueryInterface = virtioScsiR3DeviceQueryInterface;
+
+    rc = virtioConstruct(pDevIns, pVirtio, iInstance, pVirtioPciParams,
                          VIRTIO_SCSI_NAME_FMT, VIRTIO_SCSI_N_QUEUES, VIRTIO_SCSI_REGION_PCI_CAP,
-                         virtioScsiR3DevCapRead, virtioScsiR3DevCapWrite, sizeof(VIRTIODEVCFG));
+                         virtioScsiR3DevCapRead, virtioScsiR3DevCapWrite, sizeof(VIRTIODEVCAP));
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio-scsi: failed to initialize VirtIO"));
 
-    rc = PDMDevHlpPCIIORegionRegister(pDevIns, VIRTIO_SCSI_REGION_PORT_IO, 32,
+    rc = PDMDevHlpPCIIORegionRegister(pDevIns, VIRTIO_SCSI_REGION_MEM_IO, 32,
                                       PCI_ADDRESS_SPACE_MEM, virtioScsiR3Map);
     if (RT_FAILURE(rc))
@@ -904 +903 @@
         PVIRTIOSCSITARGET pTarget = &pThis->aTargetInstances[iLUN];
 
-        if (RTStrAPrintf(&pTarget->pszLunName, "VSCSI%u", iLUN) < 0)
+        if (RTStrAPrintf(&pTarget->pszLunName, "VIRTIOSCSI%u", iLUN) < 0)
             AssertLogRelFailedReturn(VERR_NO_MEMORY);
 
@@ -919 +918 @@
         pTarget->IMediaExPort.pfnIoReqQueryBuf           = NULL;
         pTarget->IMediaExPort.pfnIoReqQueryDiscardRanges = NULL;
-        pDevIns->IBase.pfnQueryInterface                 = virtioScsiR3DeviceQueryInterface;
 
         LogFunc(("Attaching LUN: %s\n", pTarget->pszLunName));
@@ -986 +984 @@
     "virtio-scsi",
     /* szRCMod */
-    "",
+    "VBoxDDRC.rc",
     /* szR0Mod */
-    "",
+    "VBoxDDR0.r0",
     /* pszDescription */
-    "Virtio SCSI.\n",
+    "Virtio Host SCSI.\n",
     /* fFlags */
 #ifdef VIRTIOSCSI_GC_SUPPORT