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

Timestamp:

Dec 15, 2021 8:54:37 PM (3 years ago)

Author:

vboxsync

Message:

VirtioCore: pcszMmioName -> szMmioName and pcszPortIoName -> szPortIoName in VIRTIOCORER3. bugref:8651

Location:

trunk/src/VBox/Devices

Files:

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

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

@@ -896 +896 @@
         pHlp->pfnPrintf(pHlp, "    cVirtqs .,................. %d\n",   pThis->cVirtqs);
         pHlp->pfnPrintf(pHlp, "    cWorkers .................. %d\n",   pThis->cWorkers);
-        pHlp->pfnPrintf(pHlp, "    MMIO mapping name ......... %d\n",   pThisCC->Virtio.pcszMmioName);
+        pHlp->pfnPrintf(pHlp, "    MMIO mapping name ......... %d\n",   pThisCC->Virtio.szMmioName);
         pHlp->pfnPrintf(pHlp, "\n");
     }

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

@@ -2537 +2537 @@
     PDMPciDevSetStatus(pPciDev, VBOX_PCI_STATUS_CAP_LIST);
 
-    size_t cbSize = RTStrPrintf(pVirtioCC->pcszMmioName, sizeof(pVirtioCC->pcszMmioName), "%s (modern)", pcszInstance);
+    size_t cbSize = RTStrPrintf(pVirtioCC->szMmioName, sizeof(pVirtioCC->szMmioName), "%s (modern)", pcszInstance);
     if (cbSize <= 0)
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio: out of memory allocating string")); /* can we put params in this error? */
 
-    cbSize = RTStrPrintf(pVirtioCC->pcszPortIoName, sizeof(pVirtioCC->pcszPortIoName), "%s (legacy)", pcszInstance);
+    cbSize = RTStrPrintf(pVirtioCC->szPortIoName, sizeof(pVirtioCC->szPortIoName), "%s (legacy)", pcszInstance);
     if (cbSize <= 0)
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio: out of memory allocating string")); /* can we put params in this error? */
@@ -2554 +2554 @@
          */
         rc = PDMDevHlpPCIIORegionCreateIo(pDevIns, VIRTIO_REGION_LEGACY_IO, sizeof(VIRTIO_LEGACY_PCI_COMMON_CFG_T) + cbDevSpecificCfg,
-                                          virtioLegacyIOPortOut, virtioLegacyIOPortIn, NULL /*pvUser*/, pVirtioCC->pcszPortIoName,
+                                          virtioLegacyIOPortOut, virtioLegacyIOPortIn, NULL /*pvUser*/, pVirtioCC->szPortIoName,
                                           NULL /*paExtDescs*/, &pVirtio->hLegacyIoPorts);
         AssertLogRelRCReturn(rc, PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio: cannot register legacy config in I/O space at BAR0 */")));
@@ -2565 +2565 @@
                                         PCI_ADDRESS_SPACE_MEM, virtioMmioWrite, virtioMmioRead, pVirtio,
                                         IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU,
-                                        pVirtioCC->pcszMmioName,
+                                        pVirtioCC->szMmioName,
                                         &pVirtio->hMmioPciCap);
     AssertLogRelRCReturn(rc, PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio: cannot register PCI Capabilities address space")));

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

@@ -460 +460 @@
     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                         */
-    char                                pcszPortIoName[MAX_NAME];  /**< PORT mapping name                         */
+    char                                szMmioName[MAX_NAME];      /**< MMIO mapping name                         */
+    char                                szPortIoName[MAX_NAME];    /**< PORT mapping name                         */
 } VIRTIOCORER3;