Changeset 84882 in vbox

Timestamp:

Jun 19, 2020 1:07:08 PM (5 years ago)

Author:

vboxsync

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

138714

Message:

fix scm burn

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet_1_0.cpp (modified) (1 diff)
• VirtIO/VirtioCore.cpp (modified) (2 diffs)
• VirtIO/VirtioCore.h (modified) (3 diffs)

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

@@ -3086 +3086 @@
     RTStrPrintf(pThis->szInst, sizeof(pThis->szInst), "VNET%d", iInstance);
 
-    /** todo Remove next line (temporary hack used for less logging clutter for single-instance debugging) */
+    /** @todo Remove next line (temporary hack used for less logging clutter for single-instance debugging) */
     *pThis->szInst = '\0';
 

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

@@ -1597 +1597 @@
 #ifdef IN_RING3
         /*
-         * Pass this MMIO write access back to the client to handle
+         * Foreward this MMIO write access for client to deal with.
          */
         return pVirtioCC->pfnDevCapWrite(pDevIns, uOffset, pv, cb);
@@ -2088 +2088 @@
     PDMPciDevSetStatus(pPciDev, VBOX_PCI_STATUS_CAP_LIST);
 
-    /* Linux drivers/virtio/virtio_pci_modern.c tries to map at least a page for the
+    size_t cbSize = RTStrPrintf(pVirtioCC->pcszMmioName, sizeof(pVirtioCC->pcszMmioName), "%s MMIO", pcszInstance);
+    if (cbSize <= 0)
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio: out of memory allocating string")); /* can we put params in this error? */
+
+    /* Note: The Linux driver at drivers/virtio/virtio_pci_modern.c tries to map at least a page for the
      * 'unknown' device-specific capability without querying the capability to figure
      *  out size, so pad with an extra page
      */
-    size_t cbSize = RTStrPrintf(pVirtioCC->pcszMmioName, sizeof(pVirtioCC->pcszMmioName), "%s MMIO", pcszInstance);
-    if (cbSize <= 0)
-        return PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio: out of memory allocating string")); /* can we put params in this error? */
-
     rc = PDMDevHlpPCIIORegionCreateMmio(pDevIns, VIRTIO_REGION_PCI_CAP, RT_ALIGN_32(cbRegion + PAGE_SIZE, PAGE_SIZE),
                                         PCI_ADDRESS_SPACE_MEM, virtioMmioWrite, virtioMmioRead, pVirtio,

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

@@ -126 +126 @@
 
 #define VIRTIO_F_VERSION_1                  RT_BIT_64(32)        /**< Required feature bit for 1.0 devices      */
-#define VIRTIO_F_INDIRECT_DESC              RT_BIT_64(28)          /**< Allow descs to point to list of descs   */
+#define VIRTIO_F_INDIRECT_DESC              RT_BIT_64(28)        /**< Allow descs to point to list of descs     */
 #define VIRTIO_F_EVENT_IDX                  RT_BIT_64(29)        /**< Allow notification disable for n elems    */
 #define VIRTIO_F_RING_INDIRECT_DESC         RT_BIT_64(28)        /**< Doc bug: Goes under two names in spec     */
@@ -288 +288 @@
     uint8_t                     uISR;                              /**< Interrupt Status Register.                */
     uint8_t                     fMsiSupport;                       /**< Flag set if using MSI instead of ISR      */
-
     /** The MMIO handle for the PCI capability region (\#2). */
     IOMMMIOHANDLE               hMmioPciCap;
@@ -356 +355 @@
     /** @} */
 
-    R3PTRTYPE(PVIRTIO_PCI_CFG_CAP_T)    pPciCfgCap;                 /**< Pointer to struct in the PCI configuration area. */
-    R3PTRTYPE(PVIRTIO_PCI_NOTIFY_CAP_T) pNotifyCap;                 /**< Pointer to struct in the PCI configuration area. */
-    R3PTRTYPE(PVIRTIO_PCI_CAP_T)        pCommonCfgCap;              /**< Pointer to struct in the PCI configuration area. */
-    R3PTRTYPE(PVIRTIO_PCI_CAP_T)        pIsrCap;                    /**< Pointer to struct in the PCI configuration area. */
-    R3PTRTYPE(PVIRTIO_PCI_CAP_T)        pDeviceCap;                 /**< Pointer to struct in the PCI configuration area. */
-
-    uint32_t                    cbDevSpecificCfg;                   /**< Size of client's dev-specific config data */
-    R3PTRTYPE(uint8_t *)        pbDevSpecificCfg;                   /**< Pointer to client's struct                */
-    R3PTRTYPE(uint8_t *)        pbPrevDevSpecificCfg;               /**< Previous read dev-specific cfg of client  */
-    bool                        fGenUpdatePending;                  /**< If set, update cfg gen after driver reads */
-    char                        pcszMmioName[MAX_NAME];             /**< MMIO mapping name                         */
+    R3PTRTYPE(PVIRTIO_PCI_CFG_CAP_T)    pPciCfgCap;                /**< Pointer to struct in PCI config area.     */
+    R3PTRTYPE(PVIRTIO_PCI_NOTIFY_CAP_T) pNotifyCap;                /**< Pointer  to struct in PCI config area.    */
+    R3PTRTYPE(PVIRTIO_PCI_CAP_T)        pCommonCfgCap;             /**< Pointer to struct in PCI config area.     */
+    R3PTRTYPE(PVIRTIO_PCI_CAP_T)        pIsrCap;                   /**< Pointer to struct in PCI config area.     */
+    R3PTRTYPE(PVIRTIO_PCI_CAP_T)        pDeviceCap;                /**< Pointer to struct in PCI config area.     */
+
+    uint32_t                    cbDevSpecificCfg;                  /**< Size of client's dev-specific config data */
+    R3PTRTYPE(uint8_t *)        pbDevSpecificCfg;                  /**< Pointer to client's struct                */
+    R3PTRTYPE(uint8_t *)        pbPrevDevSpecificCfg;              /**< Previous read dev-specific cfg of client  */
+    bool                        fGenUpdatePending;                 /**< If set, update cfg gen after driver reads */
+    char                        pcszMmioName[MAX_NAME];            /**< MMIO mapping name                         */
 } VIRTIOCORER3;