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

Timestamp:

Dec 17, 2021 7:26:36 AM (3 years ago)

Author:

vboxsync

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

148982

Message:

Fix virtio-scsi and virtio-net device name until switchover to transitional device is done. Booted Windows VM whose system disk is on VirtIO controller, so that's working

Location:

trunk/src/VBox/Devices

Files:

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

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

@@ -3587 +3587 @@
  * The device registration structure.
  */
-const PDMDEVREG g_DeviceVirtioNet_1_0  =
+const PDMDEVREG g_DeviceVirtioNet_1_0 =
 {
     /* .uVersion = */               PDM_DEVREG_VERSION,
     /* .uReserved0 = */             0,
-    /* .szName = */                 "virtio-net",
+    /* .szName = */                 "virtio-net-1-dot-0",
     /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_NEW_STYLE | PDM_DEVREG_FLAGS_RZ,
     /* .fClass = */                 PDM_DEVREG_CLASS_NETWORK,

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

@@ -2604 +2604 @@
 {
     AssertLogRelReturn(pVirtio == PDMINS_2_DATA(pDevIns, PVIRTIOCORE), VERR_STATE_CHANGED);
-
+    int rc;
 #ifdef FUTURE_OPTIMIZATION
-    int rc = PDMDevHlpSetDeviceCritSect(pDevIns, PDMDevHlpCritSectGetNop(pDevIns));
+     rc = PDMDevHlpSetDeviceCritSect(pDevIns, PDMDevHlpCritSectGetNop(pDevIns));
     AssertRCReturn(rc, rc);
 #endif
-    int rc = PDMDevHlpMmioSetUpContext(pDevIns, pVirtio->hMmioPciCap, virtioMmioWrite, virtioMmioRead, pVirtio);
+    rc = PDMDevHlpMmioSetUpContext(pDevIns, pVirtio->hMmioPciCap, virtioMmioWrite, virtioMmioRead, pVirtio);
     AssertRCReturn(rc, rc);
 
-    rc = PDMDevHlpIoPortSetUpContext(pDevIns, pVirtio->hLegacyIoPorts, virtioLegacyIOPortOut, virtioLegacyIOPortIn, NULL /*pvUser*/);
-    AssertRCReturn(rc, rc);
-
+    if (pVirtio->fOfferLegacy)
+    {
+        rc = PDMDevHlpIoPortSetUpContext(pDevIns, pVirtio->hLegacyIoPorts, virtioLegacyIOPortOut, virtioLegacyIOPortIn, NULL /*pvUser*/);
+        AssertRCReturn(rc, rc);
+    }
     return rc;
 }