- Timestamp:
- Dec 17, 2021 8:18:43 AM (3 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 18 edited
-
Devices/Makefile.kmk (modified) (3 diffs)
-
Devices/Network/DevVirtioNet_1_0.cpp (modified) (1 diff)
-
Devices/build/VBoxDD.cpp (modified) (1 diff)
-
Devices/build/VBoxDD.h (modified) (1 diff)
-
Devices/build/VBoxDDR0.cpp (modified) (1 diff)
-
Devices/testcase/tstDeviceStructSize.cpp (modified) (3 diffs)
-
Devices/testcase/tstDeviceStructSizeRC.cpp (modified) (2 diffs)
-
Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
-
Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
-
Frontends/VBoxShell/vboxshell.py (modified) (1 diff)
-
Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp (modified) (1 diff)
-
Main/idl/VirtualBox.xidl (modified) (1 diff)
-
Main/src-client/ConsoleImpl.cpp (modified) (3 diffs)
-
Main/src-client/ConsoleImpl2.cpp (modified) (4 diffs)
-
Main/src-server/NetworkAdapterImpl.cpp (modified) (1 diff)
-
Main/src-server/SystemPropertiesImpl.cpp (modified) (1 diff)
-
Main/xml/Settings.cpp (modified) (2 diffs)
-
ValidationKit/testdriver/vbox.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Makefile.kmk
r92969 r92996 523 523 VBoxDD_DEFS += VBOX_WITH_VIRTIO 524 524 VBoxDD_SOURCES += \ 525 VirtIO/Virtio.cpp \526 525 VirtIO/VirtioCore.cpp \ 527 Network/DevVirtioNet.cpp 528 endif 529 530 if defined(VBOX_WITH_VIRTIO) && defined(VBOX_WITH_VIRTIO_NET_1_0) 531 VBoxDD_DEFS += VBOX_WITH_VIRTIO_NET_1_0 532 VBoxDD_SOURCES += \ 533 Network/DevVirtioNet_1_0.cpp 534 endif 526 Network/DevVirtioNet_1_0.cpp 527 endif 528 535 529 536 530 ifdef VBOX_WITH_UDPTUNNEL … … 1064 1058 VBoxDDRC_DEFS += VBOX_WITH_VIRTIO 1065 1059 VBoxDDRC_SOURCES += \ 1066 VirtIO/Virtio.cpp \1067 1060 VirtIO/VirtioCore.cpp \ 1068 Network/DevVirtioNet.cpp 1069 endif 1070 1071 ifdef defined(VBOX_WITH_VIRTIO) && defined(VBOX_WITH_VIRTIO_NET_1_0) 1072 VBoxDDRC_DEFS += VBOX_WITH_VIRTIO_NET_1_0 1073 VBoxDDRC_SOURCES += \ 1074 Network/DevVirtioNet_1_0.cpp 1061 Network/DevVirtioNet_1_0.cpp 1075 1062 endif 1076 1063 … … 1288 1275 VBoxDDR0_DEFS += VBOX_WITH_VIRTIO 1289 1276 VBoxDDR0_SOURCES += \ 1290 VirtIO/Virtio.cpp \1291 1277 VirtIO/VirtioCore.cpp \ 1292 Network/DevVirtioNet.cpp1293 endif1294 1295 if defined(VBOX_WITH_VIRTIO) && defined(VBOX_WITH_VIRTIO_NET_1_0)1296 VBoxDDR0_DEFS += VBOX_WITH_VIRTIO_NET_1_01297 VBoxDDR0_SOURCES += \1298 1278 Network/DevVirtioNet_1_0.cpp 1299 1279 endif -
trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp
r92995 r92996 3587 3587 * The device registration structure. 3588 3588 */ 3589 const PDMDEVREG g_DeviceVirtioNet _1_0=3589 const PDMDEVREG g_DeviceVirtioNet = 3590 3590 { 3591 3591 /* .uVersion = */ PDM_DEVREG_VERSION, 3592 3592 /* .uReserved0 = */ 0, 3593 /* .szName = */ "virtio-net -1-dot-0",3593 /* .szName = */ "virtio-net", 3594 3594 /* .fFlags = */ PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_NEW_STYLE | PDM_DEVREG_FLAGS_RZ, 3595 3595 /* .fClass = */ PDM_DEVREG_CLASS_NETWORK, -
trunk/src/VBox/Devices/build/VBoxDD.cpp
r91416 r92996 117 117 return rc; 118 118 #endif 119 #ifdef VBOX_WITH_VIRTIO_NET_1_0120 rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceVirtioNet_1_0);121 if (RT_FAILURE(rc))122 return rc;123 #endif124 119 #ifdef VBOX_WITH_INIP 125 120 rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceINIP); -
trunk/src/VBox/Devices/build/VBoxDD.h
r91416 r92996 57 57 extern const PDMDEVREG g_DeviceVirtioNet; 58 58 #endif 59 #ifdef VBOX_WITH_VIRTIO_NET_1_060 extern const PDMDEVREG g_DeviceVirtioNet_1_0;61 #endif62 59 #ifdef VBOX_WITH_INIP 63 60 extern const PDMDEVREG g_DeviceINIP; -
trunk/src/VBox/Devices/build/VBoxDDR0.cpp
r91214 r92996 60 60 #ifdef VBOX_WITH_VIRTIO 61 61 &g_DeviceVirtioNet, 62 #endif63 #ifdef VBOX_WITH_VIRTIO_NET_1_064 &g_DeviceVirtioNet_1_0,65 62 #endif 66 63 &g_DeviceICHAC97, -
trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp
r89590 r92996 65 65 #undef LOG_GROUP 66 66 #include "../Network/DevPCNet.cpp" 67 #ifdef VBOX_WITH_VIRTIO68 # undef LOG_GROUP69 # include "../Network/DevVirtioNet.cpp"70 #endif71 67 #undef LOG_GROUP 72 68 #include "../PC/DevACPI.cpp" … … 347 343 CHECK_MEMBER_ALIGNMENT(E1KSTATE, StatReceiveBytes, 8); 348 344 #endif 349 #ifdef VBOX_WITH_VIRTIO350 CHECK_MEMBER_ALIGNMENT(VNETSTATE, StatReceiveBytes, 8);351 #endif352 345 //CHECK_MEMBER_ALIGNMENT(E1KSTATE, csTx, 8); 353 346 #ifdef VBOX_WITH_USB … … 407 400 CHECK_MEMBER_ALIGNMENT(VGASTATE, CritSectIRQ, 8); 408 401 CHECK_MEMBER_ALIGNMENT(VMMDEV, CritSect, 8); 409 #ifdef VBOX_WITH_VIRTIO410 CHECK_MEMBER_ALIGNMENT(VPCISTATE, cs, 8);411 CHECK_MEMBER_ALIGNMENT(VPCISTATE, led, 4);412 CHECK_MEMBER_ALIGNMENT(VPCISTATE, Queues, 8);413 #endif414 402 #ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL 415 403 CHECK_MEMBER_ALIGNMENT(PCIRAWSENDREQ, u.aGetRegionInfo.u64RegionSize, 8); -
trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp
r89590 r92996 121 121 # undef LOG_GROUP 122 122 # include "../Network/DevE1000.cpp" 123 #endif124 #ifdef VBOX_WITH_VIRTIO125 # undef LOG_GROUP126 # include "../Network/DevVirtioNet.cpp"127 123 #endif 128 124 #ifdef VBOX_WITH_BUSLOGIC … … 1562 1558 #endif /* VBOX_WITH_E1000 */ 1563 1559 1564 #ifdef VBOX_WITH_VIRTIO1565 GEN_CHECK_OFF(VPCISTATE, cs);1566 GEN_CHECK_OFF(VPCISTATE, szInstance);1567 GEN_CHECK_OFF(VPCISTATE, IBase);1568 GEN_CHECK_OFF(VPCISTATE, ILeds);1569 GEN_CHECK_OFF(VPCISTATE, pLedsConnector);1570 GEN_CHECK_OFF(VPCISTATE, pDevInsR3);1571 GEN_CHECK_OFF(VPCISTATE, pDevInsR0);1572 GEN_CHECK_OFF(VPCISTATE, pDevInsRC);1573 GEN_CHECK_OFF(VPCISTATE, pciDevice);1574 GEN_CHECK_OFF(VPCISTATE, IOPortBase);1575 GEN_CHECK_OFF(VPCISTATE, led);1576 GEN_CHECK_OFF(VPCISTATE, uGuestFeatures);1577 GEN_CHECK_OFF(VPCISTATE, uQueueSelector);1578 GEN_CHECK_OFF(VPCISTATE, uStatus);1579 GEN_CHECK_OFF(VPCISTATE, uISR);1580 GEN_CHECK_OFF(VPCISTATE, Queues);1581 GEN_CHECK_OFF(VPCISTATE, Queues[VIRTIO_MAX_NQUEUES]);1582 GEN_CHECK_OFF(VNETSTATE, VPCI);1583 GEN_CHECK_OFF(VNETSTATE, INetworkDown);1584 GEN_CHECK_OFF(VNETSTATE, INetworkConfig);1585 GEN_CHECK_OFF(VNETSTATE, pDrvBase);1586 GEN_CHECK_OFF(VNETSTATE, pCanRxQueueR3);1587 GEN_CHECK_OFF(VNETSTATE, pCanRxQueueR0);1588 GEN_CHECK_OFF(VNETSTATE, pCanRxQueueRC);1589 GEN_CHECK_OFF(VNETSTATE, pLinkUpTimer);1590 # ifdef VNET_TX_DELAY1591 GEN_CHECK_OFF(VNETSTATE, pTxTimerR3);1592 GEN_CHECK_OFF(VNETSTATE, pTxTimerR0);1593 GEN_CHECK_OFF(VNETSTATE, pTxTimerRC);1594 # endif /* VNET_TX_DELAY */1595 GEN_CHECK_OFF(VNETSTATE, config);1596 GEN_CHECK_OFF(VNETSTATE, macConfigured);1597 GEN_CHECK_OFF(VNETSTATE, fCableConnected);1598 GEN_CHECK_OFF(VNETSTATE, u32PktNo);1599 GEN_CHECK_OFF(VNETSTATE, fPromiscuous);1600 GEN_CHECK_OFF(VNETSTATE, fAllMulti);1601 GEN_CHECK_OFF(VNETSTATE, pRxQueue);1602 GEN_CHECK_OFF(VNETSTATE, pTxQueue);1603 GEN_CHECK_OFF(VNETSTATE, pCtlQueue);1604 GEN_CHECK_OFF(VNETSTATE, fMaybeOutOfSpace);1605 GEN_CHECK_OFF(VNETSTATE, hEventMoreRxDescAvail);1606 #endif /* VBOX_WITH_VIRTIO */1607 1608 1560 /* VMMDev*.cpp/h */ 1609 1561 GEN_CHECK_SIZE(VMMDEV); -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
r92594 r92996 1813 1813 #ifdef VBOX_WITH_VIRTIO 1814 1814 case NetworkAdapterType_Virtio: pszNICType = "virtio"; break; 1815 1816 #endif1817 #ifdef VBOX_WITH_VIRTIO_NET_1_01818 case NetworkAdapterType_Virtio_1_0: pszNICType = "virtio_1.0"; break;1819 1815 #endif 1820 1816 default: -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
r92594 r92996 1554 1554 } 1555 1555 #endif /* VBOX_WITH_VIRTIO */ 1556 #ifdef VBOX_WITH_VIRTIO_NET_1_01557 else if (!RTStrICmp(ValueUnion.psz, "virtio_1.0"))1558 {1559 CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_Virtio_1_0));1560 }1561 #endif /* VBOX_WITH_VIRTIO_NET_1_0 */1562 1556 else 1563 1557 { -
trunk/src/VBox/Frontends/VBoxShell/vboxshell.py
r92675 r92996 1657 1657 elif (natype == ctx['global'].constants.NetworkAdapterType_Virtio): 1658 1658 return "virtio" 1659 elif (natype == ctx['global'].constants.NetworkAdapterType_Virtio_1_0):1660 return "virtio_1.0"1661 1659 elif (natype == ctx['global'].constants.NetworkAdapterType_Null): 1662 1660 return None -
trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp
r92787 r92996 411 411 case KNetworkAdapterType_I82545EM: return QApplication::translate("UICommon", "Intel PRO/1000 MT Server (82545EM)", "NetworkAdapterType"); 412 412 case KNetworkAdapterType_Virtio: return QApplication::translate("UICommon", "Paravirtualized Network (virtio-net)", "NetworkAdapterType"); 413 case KNetworkAdapterType_Virtio_1_0: return QApplication::translate("UICommon", "Paravirtualized Network (virtio-net 1.0)", "NetworkAdapterType");414 413 case KNetworkAdapterType_Am79C960: return QApplication::translate("UICommon", "PCnet-ISA (Am79C960)", "NetworkAdapterType"); 415 414 default: AssertMsgFailed(("No text for %d", type)); break; -
trunk/src/VBox/Main/idl/VirtualBox.xidl
r92880 r92996 20542 20542 <desc>AMD PCnet-ISA/NE2100 network card (Am79C960).</desc> 20543 20543 </const> 20544 <const name="Virtio_1_0" value="8">20545 <desc>Virtio 1.0 network device.</desc>20546 </const>20547 20544 </enum> 20548 20545 -
trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
r91718 r92996 1558 1558 return "virtio-net"; 1559 1559 #endif 1560 #ifdef VBOX_WITH_VIRTIO_NET_1_01561 case NetworkAdapterType_Virtio_1_0:1562 return "virtio-net-1-dot-0";1563 #endif1564 1560 default: 1565 1561 AssertFailed(); … … 4252 4248 notifyNatDnsChange(ptrVM.rawUVM(), "e1000", ulInstanceMax); 4253 4249 notifyNatDnsChange(ptrVM.rawUVM(), "virtio-net", ulInstanceMax); 4254 notifyNatDnsChange(ptrVM.rawUVM(), "virtio-net-1-dot-0", ulInstanceMax);4255 4250 } 4256 4251 } … … 4931 4926 AssertMsg( ( !strcmp(pszDevice, "pcnet") 4932 4927 || !strcmp(pszDevice, "e1000") 4933 || !strcmp(pszDevice, "virtio-net") 4934 || !strcmp(pszDevice, "virtio-net-1-dot-0")) 4928 || !strcmp(pszDevice, "virtio-net")) 4935 4929 && uLun == 0 4936 4930 && uInstance < maxNetworkAdapters, -
trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
r92366 r92996 2612 2612 InsertConfigNode(pDevices, "virtio-net", &pDevVirtioNet); 2613 2613 #endif /* VBOX_WITH_VIRTIO */ 2614 #ifdef VBOX_WITH_VIRTIO_NET_1_02615 PCFGMNODE pDevVirtioNet1_0 = NULL; /* Virtio network devices */2616 InsertConfigNode(pDevices, "virtio-net-1-dot-0", &pDevVirtioNet1_0);2617 #endif /* VBOX_WITH_VIRTIO_NET_1_0 */2618 2614 std::list<BootNic> llBootNics; 2619 2615 for (ULONG uInstance = 0; uInstance < maxNetworkAdapters; ++uInstance) … … 2653 2649 break; 2654 2650 #endif /* VBOX_WITH_VIRTIO */ 2655 #ifdef VBOX_WITH_VIRTIO_NET_1_02656 case NetworkAdapterType_Virtio_1_0:2657 pDev = pDevVirtioNet1_0;2658 pszAdapterName = "virtio-net-1-dot-0";2659 break;2660 #endif /* VBOX_WITH_VIRTIO_NET_1_0 */2661 2651 default: 2662 2652 AssertMsgFailed(("Invalid network adapter type '%d' for slot '%d'", adapterType, uInstance)); … … 2721 2711 2722 2712 /* 2723 * The virtual hardware type. PCNet supports t wotypes, E1000 three,2713 * The virtual hardware type. PCNet supports three types, E1000 three, 2724 2714 * but VirtIO only one. 2725 2715 */ … … 2745 2735 break; 2746 2736 case NetworkAdapterType_Virtio: 2747 break;2748 case NetworkAdapterType_Virtio_1_0:2749 2737 break; 2750 2738 case NetworkAdapterType_Null: AssertFailedBreak(); /* (compiler warnings) */ -
trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp
r91416 r92996 246 246 case NetworkAdapterType_Virtio: 247 247 #endif 248 #ifdef VBOX_WITH_VIRTIO_NET_1_0249 case NetworkAdapterType_Virtio_1_0:250 #endif /* VBOX_WITH_VIRTIO */251 248 break; 252 249 default: -
trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp
r91416 r92996 1650 1650 NetworkAdapterType_I82545EM, 1651 1651 NetworkAdapterType_Virtio, 1652 #ifdef VBOX_WITH_VIRTIO_NET_1_01653 NetworkAdapterType_Virtio_1_0,1654 #endif1655 1652 }; 1656 1653 aSupportedNetworkAdapterTypes.assign(aNetworkAdapterTypes, -
trunk/src/VBox/Main/xml/Settings.cpp
r92223 r92996 4113 4113 else if (strTemp == "virtio") 4114 4114 nic.type = NetworkAdapterType_Virtio; 4115 else if (strTemp == "virtio_1.0")4116 nic.type = NetworkAdapterType_Virtio_1_0;4117 4115 else 4118 4116 throw ConfigFileError(this, pelmAdapter, N_("Invalid value '%s' in Adapter/@type attribute"), strTemp.c_str()); … … 6841 6839 case NetworkAdapterType_I82545EM: pcszType = "82545EM"; break; 6842 6840 case NetworkAdapterType_Virtio: pcszType = "virtio"; break; 6843 case NetworkAdapterType_Virtio_1_0: pcszType = "virtio_1.0"; break;6844 6841 default: /*case NetworkAdapterType_Am79C970A:*/ pcszType = "Am79C970A"; break; 6845 6842 } -
trunk/src/VBox/ValidationKit/testdriver/vbox.py
r92980 r92996 1918 1918 elif oNic.adapterType == vboxcon.NetworkAdapterType_Virtio: 1919 1919 sAdpName = 'virtio-net'; 1920 elif oNic.adapterType == vboxcon.NetworkAdapterType_Virtio_1_0:1921 sAdpName = 'virtio-net-1-dot-0';1922 1920 return sAdpName; 1923 1921
Note:
See TracChangeset
for help on using the changeset viewer.

