Changeset 85045 in vbox

Timestamp:

Jul 3, 2020 7:07:42 AM (4 years ago)

Author:

vboxsync

Message:

Network/DevVirtioNet_1_0.cpp: Return virtioCoreVirtqAttach() to virtioCoreR3VirtqAttach() because it otherwise drags a RTStrCopy() reference into VBoxDD0 and breaks things.

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet_1_0.cpp (modified) (1 diff)
• Storage/DevVirtioSCSI.cpp (modified) (1 diff)
• VirtIO/VirtioCore.cpp (modified) (10 diffs)
• VirtIO/VirtioCore.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp

@@ -2859 +2859 @@
             PVIRTIONETVIRTQ pVirtq = &pThis->aVirtqs[uVirtqNbr];
             pVirtq->idx = uVirtqNbr;
-            (void) virtioCoreVirtqAttach(&pThis->Virtio, pVirtq->idx, pVirtq->szName);
+            (void) virtioCoreR3VirtqAttach(&pThis->Virtio, pVirtq->idx, pVirtq->szName);
             pVirtq->fAttachedToVirtioCore = true;
             if (IS_VIRTQ_EMPTY(pThisCC->pDevIns, &pThis->Virtio, pVirtq->idx))

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

@@ -2473 +2473 @@
     for (uint16_t uVirtqNbr = 0; uVirtqNbr < VIRTIOSCSI_VIRTQ_CNT; uVirtqNbr++)
     {
-        rc = virtioCoreVirtqAttach(&pThis->Virtio, uVirtqNbr, VIRTQNAME(uVirtqNbr));
+        rc = virtioCoreR3VirtqAttach(&pThis->Virtio, uVirtqNbr, VIRTQNAME(uVirtqNbr));
         if (RT_FAILURE(rc))
             continue;

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

@@ -296 +296 @@
  * @param   pDevIns     The device instance.
  * @param   pVirtio     Pointer to the shared virtio state.
- * @param   uVirtqNbr    Virtq number
+ * @param   uVirtqNbr   Virtq number
  *
  * @returns how many entries have been added to ring as a delta of the consumer's
@@ -657 +657 @@
 }
 
-int virtioCoreVirtqAttach(PVIRTIOCORE pVirtio, uint16_t uVirtqNbr, const char *pcszName)
+#ifdef IN_RING3
+
+int virtioCoreR3VirtqAttach(PVIRTIOCORE pVirtio, uint16_t uVirtqNbr, const char *pcszName)
 {
     LogFunc(("%s\n", pcszName));
@@ -668 +670 @@
     return VINF_SUCCESS;
 }
-
-#ifdef IN_RING3
 
 /** API Fuunction: See header file */
@@ -749 +749 @@
 }
 
-
 /** API Function: See header file */
 int virtioCoreR3VirtqAvailBufGet(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint16_t uVirtqNbr,
@@ -1098 +1097 @@
 }
 
-
 /**
+ * This is called from the MMIO callback code when the guest does an MMIO access to the
+ * mapped queue notification capability area corresponding to a particular queue, to notify
+ * the queue handler of available data in the avail ring of the queue (VirtIO 1.0, 4.1.4.4.1)
+ *
+ * @param   pDevIns     The device instance.
+ * @param   pVirtio     Pointer to the shared virtio state.
+ * @param   uVirtqNbr   Virtq to check for guest interrupt handling preference
+ * @param   uNotifyIdx  Notification index
  */
 static void virtioCoreVirtqNotified(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint16_t uVirtqNbr, uint16_t uNotifyIdx)
 {
-
     PVIRTIOCORECC pVirtioCC = PDMDEVINS_2_DATA_CC(pDevIns, PVIRTIOCORECC);
 
@@ -1133 +1138 @@
  * @param   pDevIns     The device instance.
  * @param   pVirtio     Pointer to the shared virtio state.
- * @param   uVirtqNbr    Virtq to check for guest interrupt handling preference
+ * @param   uVirtqNbr   Virtq to check for guest interrupt handling preference
  */
 static void virtioCoreNotifyGuestDriver(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint16_t uVirtqNbr)
 {
-
     Assert(uVirtqNbr < RT_ELEMENTS(pVirtio->aVirtqState));
     PVIRTQSTATE pVirtqState = &pVirtio->aVirtqState[uVirtqNbr];
@@ -1265 +1269 @@
 /**
  * Invoked by this implementation when guest driver resets the device.
- * The driver itself will not  until the device has read the status change.
+ * The driver itself will not until the device has read the status change.
  */
 static void virtioGuestR3WasReset(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, PVIRTIOCORECC pVirtioCC)
@@ -1304 +1308 @@
             VIRTIO_DEV_CONFIG_LOG_ACCESS(uDeviceFeatures, VIRTIO_PCI_COMMON_CFG_T, uOffsetOfAccess);
             LogFunc(("... WARNING: Guest attempted to write readonly virtio_pci_common_cfg.device_feature (ignoring)\n"));
-//            return VINF_SUCCESS;
-            return VINF_IOM_MMIO_UNUSED_00; /** @todo which is right this or VINF_SUCCESS? */
+            return VINF_IOM_MMIO_UNUSED_00;
         }
         else /* Guest READ pCommonCfg->uDeviceFeatures */
@@ -1790 +1793 @@
 }
 
-
 /*********************************************************************************************************************************
 *   Device Level                                                                                                                 *
@@ -2015 +2017 @@
     if (pVirtioCC->pbDevSpecificCfg)
     {
-        /* Following capability (via VirtIO 1.0, section 4.1.4.6). Client defines the
-         * device-specific config fields struct and passes size to this constructor */
+        /* Device specific config capability (via VirtIO 1.0, section 4.1.4.6).
+         * Client defines the device-specific config struct and passes size to virtioCoreR3Init()
+         * to inform this. */
         pCfg = (PVIRTIO_PCI_CAP_T)&pPciDev->abConfig[pCfg->uCapNext];
         pCfg->uCfgType = VIRTIO_PCI_CAP_DEVICE_CFG;

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

@@ -424 +424 @@
  * @returns VBox status code.
  */
-int  virtioCoreVirtqAttach(PVIRTIOCORE pVirtio, uint16_t uVirtqNbr, const char *pcszName);
+int  virtioCoreR3VirtqAttach(PVIRTIOCORE pVirtio, uint16_t uVirtqNbr, const char *pcszName);
 
 /**