Changeset 88827 in vbox for trunk/src/VBox/Devices

Timestamp:

May 3, 2021 11:46:01 AM (4 years ago)

Author:

vboxsync

Message:

Storage/DevVirtioSCSI: Fix a few things to get code working on Windows again well enough to see vscsi disks in Windows Disk formatting utility, see @BugRef(9440), comment #150

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevVirtioSCSI.cpp (modified) (5 diffs)
• VirtIO/VirtioCore.cpp (modified) (3 diffs)

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

@@ -12 +12 @@
 
 /*
- * Copyright (C) 2006-2020 Oracle Corporation
+ * Copyright (C) 2006-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -84 +84 @@
 #define VIRTIOSCSI_VIRTQ_CNT                        (VIRTIOSCSI_REQ_VIRTQ_CNT + 2)
 #define VIRTIOSCSI_MAX_TARGETS                      256         /**< T.B.D. Figure out a a good value for this.      */
-#define VIRTIOSCSI_MAX_LUN                          256         /**< VirtIO specification, section 5.6.4             */
+#define VIRTIOSCSI_MAX_LUN                          1           /**< VirtIO specification, section 5.6.4             */
 #define VIRTIOSCSI_MAX_COMMANDS_PER_LUN             128         /**< T.B.D. What is a good value for this?           */
 #define VIRTIOSCSI_MAX_SEG_COUNT                    126         /**< T.B.D. What is a good value for this?           */
@@ -1270 +1270 @@
     }
 
+#if 0
     if (RT_LIKELY(!cbDataIn || !cbDataOut || pThis->fHasInOutBufs)) /* VirtIO 1.0, 5.6.6.1.1 */
     { /*  likely */ }
@@ -1280 +1281 @@
                                    VIRTIOSCSI_S_FAILURE, abSense, sizeof(abSense), cbSenseCfg);
     }
-
+#endif
     /*
      * Have underlying driver allocate a req of size set during initialization of this device.
@@ -1710 +1711 @@
         for (unsigned i = 0; i < VIRTIOSCSI_VIRTQ_CNT; i++)
             pThis->afVirtqAttached[i] = false;
-    }
+
+        /*
+         * BIOS may change these values. When the OS comes up, and KVM driver accessed
+         * through the Windows, assumes they are the default size. So as per the VirtIO 1.0 spec,
+         * 5.6.4, these device configuration values must be set to default upon device reset.
+         */
+        pThis->virtioScsiConfig.uSenseSize = VIRTIOSCSI_SENSE_SIZE_DEFAULT;
+        pThis->virtioScsiConfig.uCdbSize   = VIRTIOSCSI_CDB_SIZE_DEFAULT;
+    }
+
+
 }
 

trunk/src/VBox/Devices/VirtIO/VirtioCore.cpp

@@ -974 +974 @@
 static void virtioCoreVirtqNotified(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint16_t uVirtq, uint16_t uNotifyIdx)
 {
-    PVIRTIOCORECC pVirtioCC = PDMDEVINS_2_DATA_CC(pDevIns, PVIRTIOCORECC);
+    PVIRTIOCORECC pVirtioCC = PDMINS_2_DATA_CC(pDevIns, PVIRTIOCORECC);
+
 
     /* See VirtIO 1.0, section 4.1.5.2 It implies that uVirtq and uNotifyIdx should match.
@@ -1408 +1409 @@
         return virtioCommonCfgAccessed(pDevIns, pVirtio, pVirtioCC, false /* fWrite */, uOffset, cb, pv);
 
-    if (MATCHES_VIRTIO_CAP_STRUCT(off, cb, uOffset, pVirtio->LocIsrCap) && cb == sizeof(uint8_t))
+    if (MATCHES_VIRTIO_CAP_STRUCT(off, cb, uOffset, pVirtio->LocIsrCap))
     {
         *(uint8_t *)pv = pVirtio->uISR;
         Log6Func(("Read and clear ISR\n"));
-        pVirtio->uISR = 0; /* VirtIO specification requires reads of ISR to clear it */
+        pVirtio->uISR = 0; /* VirtIO spec requires reads of ISR to clear it */
         virtioLowerInterrupt(pDevIns, 0);
         return VINF_SUCCESS;
     }
 
-    ASSERT_GUEST_MSG_FAILED(("Bad read access to mapped capabilities region: off=%RGp cb=%u\n", off, cb));
+    ASSERT_GUEST_MSG_FAILED(("Bad read access to mapped capabilities region: off=%RGp cb=%u\n"));
     return VINF_IOM_MMIO_UNUSED_00;
 }
@@ -1500 +1501 @@
 
         if (  (uLength != 1 && uLength != 2 && uLength != 4)
-            || cb != uLength
             || pPciCap->uBar != VIRTIO_REGION_PCI_CAP)
         {