Changeset 92996 in vbox for trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

Timestamp:

Dec 17, 2021 8:18:43 AM (3 years ago)

Author:

vboxsync

Message:

virtio-net works on linux in local testing, and virtio-scsi works on windows. Integrating the switchover to make DevVirtioNet_1_0.cpp the 'virtio-net' option in the Virtual Network Controller list.

File:

• trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -65 +65 @@
 #undef LOG_GROUP
 #include "../Network/DevPCNet.cpp"
-#ifdef VBOX_WITH_VIRTIO
-# undef LOG_GROUP
-# include "../Network/DevVirtioNet.cpp"
-#endif
 #undef LOG_GROUP
 #include "../PC/DevACPI.cpp"
@@ -347 +343 @@
     CHECK_MEMBER_ALIGNMENT(E1KSTATE, StatReceiveBytes, 8);
 #endif
-#ifdef VBOX_WITH_VIRTIO
-    CHECK_MEMBER_ALIGNMENT(VNETSTATE, StatReceiveBytes, 8);
-#endif
     //CHECK_MEMBER_ALIGNMENT(E1KSTATE, csTx, 8);
 #ifdef VBOX_WITH_USB
@@ -407 +400 @@
     CHECK_MEMBER_ALIGNMENT(VGASTATE, CritSectIRQ, 8);
     CHECK_MEMBER_ALIGNMENT(VMMDEV, CritSect, 8);
-#ifdef VBOX_WITH_VIRTIO
-    CHECK_MEMBER_ALIGNMENT(VPCISTATE, cs, 8);
-    CHECK_MEMBER_ALIGNMENT(VPCISTATE, led, 4);
-    CHECK_MEMBER_ALIGNMENT(VPCISTATE, Queues, 8);
-#endif
 #ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
     CHECK_MEMBER_ALIGNMENT(PCIRAWSENDREQ, u.aGetRegionInfo.u64RegionSize, 8);