VirtualBox

Changeset 92996 in vbox for trunk


Ignore:
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.

Location:
trunk/src/VBox
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/Makefile.kmk

    r92969 r92996  
    523523  VBoxDD_DEFS           += VBOX_WITH_VIRTIO
    524524  VBoxDD_SOURCES        += \
    525         VirtIO/Virtio.cpp \
    526525        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
    535529
    536530 ifdef VBOX_WITH_UDPTUNNEL
     
    10641058   VBoxDDRC_DEFS        += VBOX_WITH_VIRTIO
    10651059   VBoxDDRC_SOURCES     += \
    1066         VirtIO/Virtio.cpp \
    10671060        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
    10751062  endif
    10761063
     
    12881275  VBoxDDR0_DEFS         += VBOX_WITH_VIRTIO
    12891276  VBoxDDR0_SOURCES      += \
    1290         VirtIO/Virtio.cpp \
    12911277        VirtIO/VirtioCore.cpp \
    1292         Network/DevVirtioNet.cpp
    1293  endif
    1294 
    1295  if defined(VBOX_WITH_VIRTIO) && defined(VBOX_WITH_VIRTIO_NET_1_0)
    1296   VBoxDDR0_DEFS         += VBOX_WITH_VIRTIO_NET_1_0
    1297   VBoxDDR0_SOURCES      += \
    12981278        Network/DevVirtioNet_1_0.cpp
    12991279 endif
  • trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp

    r92995 r92996  
    35873587 * The device registration structure.
    35883588 */
    3589 const PDMDEVREG g_DeviceVirtioNet_1_0 =
     3589const PDMDEVREG g_DeviceVirtioNet =
    35903590{
    35913591    /* .uVersion = */               PDM_DEVREG_VERSION,
    35923592    /* .uReserved0 = */             0,
    3593     /* .szName = */                 "virtio-net-1-dot-0",
     3593    /* .szName = */                 "virtio-net",
    35943594    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_NEW_STYLE | PDM_DEVREG_FLAGS_RZ,
    35953595    /* .fClass = */                 PDM_DEVREG_CLASS_NETWORK,
  • trunk/src/VBox/Devices/build/VBoxDD.cpp

    r91416 r92996  
    117117        return rc;
    118118#endif
    119 #ifdef VBOX_WITH_VIRTIO_NET_1_0
    120     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceVirtioNet_1_0);
    121     if (RT_FAILURE(rc))
    122         return rc;
    123 #endif
    124119#ifdef VBOX_WITH_INIP
    125120    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceINIP);
  • trunk/src/VBox/Devices/build/VBoxDD.h

    r91416 r92996  
    5757extern const PDMDEVREG g_DeviceVirtioNet;
    5858#endif
    59 #ifdef VBOX_WITH_VIRTIO_NET_1_0
    60 extern const PDMDEVREG g_DeviceVirtioNet_1_0;
    61 #endif
    6259#ifdef VBOX_WITH_INIP
    6360extern const PDMDEVREG g_DeviceINIP;
  • trunk/src/VBox/Devices/build/VBoxDDR0.cpp

    r91214 r92996  
    6060#ifdef VBOX_WITH_VIRTIO
    6161    &g_DeviceVirtioNet,
    62 #endif
    63 #ifdef VBOX_WITH_VIRTIO_NET_1_0
    64     &g_DeviceVirtioNet_1_0,
    6562#endif
    6663    &g_DeviceICHAC97,
  • trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

    r89590 r92996  
    6565#undef LOG_GROUP
    6666#include "../Network/DevPCNet.cpp"
    67 #ifdef VBOX_WITH_VIRTIO
    68 # undef LOG_GROUP
    69 # include "../Network/DevVirtioNet.cpp"
    70 #endif
    7167#undef LOG_GROUP
    7268#include "../PC/DevACPI.cpp"
     
    347343    CHECK_MEMBER_ALIGNMENT(E1KSTATE, StatReceiveBytes, 8);
    348344#endif
    349 #ifdef VBOX_WITH_VIRTIO
    350     CHECK_MEMBER_ALIGNMENT(VNETSTATE, StatReceiveBytes, 8);
    351 #endif
    352345    //CHECK_MEMBER_ALIGNMENT(E1KSTATE, csTx, 8);
    353346#ifdef VBOX_WITH_USB
     
    407400    CHECK_MEMBER_ALIGNMENT(VGASTATE, CritSectIRQ, 8);
    408401    CHECK_MEMBER_ALIGNMENT(VMMDEV, CritSect, 8);
    409 #ifdef VBOX_WITH_VIRTIO
    410     CHECK_MEMBER_ALIGNMENT(VPCISTATE, cs, 8);
    411     CHECK_MEMBER_ALIGNMENT(VPCISTATE, led, 4);
    412     CHECK_MEMBER_ALIGNMENT(VPCISTATE, Queues, 8);
    413 #endif
    414402#ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
    415403    CHECK_MEMBER_ALIGNMENT(PCIRAWSENDREQ, u.aGetRegionInfo.u64RegionSize, 8);
  • trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

    r89590 r92996  
    121121# undef LOG_GROUP
    122122# include "../Network/DevE1000.cpp"
    123 #endif
    124 #ifdef VBOX_WITH_VIRTIO
    125 # undef LOG_GROUP
    126 # include "../Network/DevVirtioNet.cpp"
    127123#endif
    128124#ifdef VBOX_WITH_BUSLOGIC
     
    15621558#endif /* VBOX_WITH_E1000 */
    15631559
    1564 #ifdef VBOX_WITH_VIRTIO
    1565     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_DELAY
    1591     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 
    16081560    /* VMMDev*.cpp/h */
    16091561    GEN_CHECK_SIZE(VMMDEV);
  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

    r92594 r92996  
    18131813#ifdef VBOX_WITH_VIRTIO
    18141814                    case NetworkAdapterType_Virtio:     pszNICType = "virtio";      break;
    1815 
    1816 #endif
    1817 #ifdef VBOX_WITH_VIRTIO_NET_1_0
    1818                     case NetworkAdapterType_Virtio_1_0: pszNICType = "virtio_1.0";  break;
    18191815#endif
    18201816                    default:
  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

    r92594 r92996  
    15541554                }
    15551555#endif /* VBOX_WITH_VIRTIO */
    1556 #ifdef VBOX_WITH_VIRTIO_NET_1_0
    1557                 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 */
    15621556                else
    15631557                {
  • trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

    r92675 r92996  
    16571657    elif (natype == ctx['global'].constants.NetworkAdapterType_Virtio):
    16581658        return "virtio"
    1659     elif (natype == ctx['global'].constants.NetworkAdapterType_Virtio_1_0):
    1660         return "virtio_1.0"
    16611659    elif (natype == ctx['global'].constants.NetworkAdapterType_Null):
    16621660        return None
  • trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

    r92787 r92996  
    411411        case KNetworkAdapterType_I82545EM:   return QApplication::translate("UICommon", "Intel PRO/1000 MT Server (82545EM)", "NetworkAdapterType");
    412412        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");
    414413        case KNetworkAdapterType_Am79C960:   return QApplication::translate("UICommon", "PCnet-ISA (Am79C960)", "NetworkAdapterType");
    415414        default: AssertMsgFailed(("No text for %d", type)); break;
  • trunk/src/VBox/Main/idl/VirtualBox.xidl

    r92880 r92996  
    2054220542        <desc>AMD PCnet-ISA/NE2100 network card (Am79C960).</desc>
    2054320543    </const>
    20544     <const name="Virtio_1_0"            value="8">
    20545         <desc>Virtio 1.0 network device.</desc>
    20546     </const>
    2054720544  </enum>
    2054820545
  • trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

    r91718 r92996  
    15581558            return "virtio-net";
    15591559#endif
    1560 #ifdef VBOX_WITH_VIRTIO_NET_1_0
    1561         case NetworkAdapterType_Virtio_1_0:
    1562             return "virtio-net-1-dot-0";
    1563 #endif
    15641560        default:
    15651561            AssertFailed();
     
    42524248            notifyNatDnsChange(ptrVM.rawUVM(), "e1000", ulInstanceMax);
    42534249            notifyNatDnsChange(ptrVM.rawUVM(), "virtio-net", ulInstanceMax);
    4254             notifyNatDnsChange(ptrVM.rawUVM(), "virtio-net-1-dot-0", ulInstanceMax);
    42554250        }
    42564251    }
     
    49314926    AssertMsg(   (   !strcmp(pszDevice, "pcnet")
    49324927                  || !strcmp(pszDevice, "e1000")
    4933                   || !strcmp(pszDevice, "virtio-net")
    4934                   || !strcmp(pszDevice, "virtio-net-1-dot-0"))
     4928                  || !strcmp(pszDevice, "virtio-net"))
    49354929              && uLun == 0
    49364930              && uInstance < maxNetworkAdapters,
  • trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

    r92366 r92996  
    26122612        InsertConfigNode(pDevices, "virtio-net", &pDevVirtioNet);
    26132613#endif /* VBOX_WITH_VIRTIO */
    2614 #ifdef VBOX_WITH_VIRTIO_NET_1_0
    2615         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 */
    26182614        std::list<BootNic> llBootNics;
    26192615        for (ULONG uInstance = 0; uInstance < maxNetworkAdapters; ++uInstance)
     
    26532649                    break;
    26542650#endif /* VBOX_WITH_VIRTIO */
    2655 #ifdef VBOX_WITH_VIRTIO_NET_1_0
    2656                 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 */
    26612651                default:
    26622652                    AssertMsgFailed(("Invalid network adapter type '%d' for slot '%d'", adapterType, uInstance));
     
    27212711
    27222712            /*
    2723              * The virtual hardware type. PCNet supports two types, E1000 three,
     2713             * The virtual hardware type. PCNet supports three types, E1000 three,
    27242714             * but VirtIO only one.
    27252715             */
     
    27452735                    break;
    27462736                case NetworkAdapterType_Virtio:
    2747                     break;
    2748                 case NetworkAdapterType_Virtio_1_0:
    27492737                    break;
    27502738                case NetworkAdapterType_Null:      AssertFailedBreak(); /* (compiler warnings) */
  • trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp

    r91416 r92996  
    246246        case NetworkAdapterType_Virtio:
    247247#endif
    248 #ifdef VBOX_WITH_VIRTIO_NET_1_0
    249         case NetworkAdapterType_Virtio_1_0:
    250 #endif /* VBOX_WITH_VIRTIO */
    251248            break;
    252249        default:
  • trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp

    r91416 r92996  
    16501650        NetworkAdapterType_I82545EM,
    16511651        NetworkAdapterType_Virtio,
    1652 #ifdef VBOX_WITH_VIRTIO_NET_1_0
    1653         NetworkAdapterType_Virtio_1_0,
    1654 #endif
    16551652    };
    16561653    aSupportedNetworkAdapterTypes.assign(aNetworkAdapterTypes,
  • trunk/src/VBox/Main/xml/Settings.cpp

    r92223 r92996  
    41134113            else if (strTemp == "virtio")
    41144114                nic.type = NetworkAdapterType_Virtio;
    4115             else if (strTemp == "virtio_1.0")
    4116                 nic.type = NetworkAdapterType_Virtio_1_0;
    41174115            else
    41184116                throw ConfigFileError(this, pelmAdapter, N_("Invalid value '%s' in Adapter/@type attribute"), strTemp.c_str());
     
    68416839                        case NetworkAdapterType_I82545EM:   pcszType = "82545EM"; break;
    68426840                        case NetworkAdapterType_Virtio:     pcszType = "virtio"; break;
    6843                         case NetworkAdapterType_Virtio_1_0: pcszType = "virtio_1.0"; break;
    68446841                        default: /*case NetworkAdapterType_Am79C970A:*/  pcszType = "Am79C970A"; break;
    68456842                    }
  • trunk/src/VBox/ValidationKit/testdriver/vbox.py

    r92980 r92996  
    19181918        elif oNic.adapterType == vboxcon.NetworkAdapterType_Virtio:
    19191919            sAdpName = 'virtio-net';
    1920         elif oNic.adapterType == vboxcon.NetworkAdapterType_Virtio_1_0:
    1921             sAdpName = 'virtio-net-1-dot-0';
    19221920        return sAdpName;
    19231921
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette