Changeset 107267 in vbox for trunk/src/VBox/Main

Timestamp:

Dec 10, 2024 7:37:35 AM (2 months ago)

Author:

vboxsync

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

166288

Message:

Main/API,UI: bugref:10810 Based on Brent's patch, added UsbNet support into Main API and UI

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• include/ConsoleImpl.h (modified) (1 diff)
• src-all/PlatformPropertiesImpl.cpp (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (2 diffs)
• src-client/ConsoleImplConfigArmV8.cpp (modified) (1 diff)
• src-client/ConsoleImplConfigCommon.cpp (modified) (8 diffs)
• src-client/ConsoleImplConfigX86.cpp (modified) (1 diff)
• src-server/NetworkAdapterImpl.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -22448 +22448 @@
         <desc>3Com EtherLink network card (3C501/3C500).</desc>
     </const>
+    <const name="UsbNet"                value="14">
+        <desc>Ethernet over USB device (usbnet).</desc>
+    </const>
   </enum>
 

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -877 +877 @@
     int i_configNetworkCtrls(ComPtr<IMachine> pMachine, ComPtr<IPlatformProperties> pPlatformProperties,
                              ChipsetType_T enmChipset, BusAssignmentManager *pBusMgr, PCVMMR3VTABLE pVMM, PUVM pUVM,
-                             PCFGMNODE pDevices, std::list<BootNic> &llBootNics);
+                             PCFGMNODE pDevices, PCFGMNODE pUsbDevices, std::list<BootNic> &llBootNics);
 #if defined(VBOX_WITH_TPM)
     int i_configTpm(ComPtr<ITrustedPlatformModule> pTpm, TpmType_T enmTpmType, PCFGMNODE pDevices,

trunk/src/VBox/Main/src-all/PlatformPropertiesImpl.cpp

@@ -781 +781 @@
               , NetworkAdapterType_Virtio
 #endif
+              , NetworkAdapterType_UsbNet
             };
             aSupportedNetworkAdapterTypes.assign(aNetworkAdapterTypes + 1 /* Don't include _Null */,
@@ -800 +801 @@
               , NetworkAdapterType_Virtio
 #endif
+              , NetworkAdapterType_UsbNet
             };
             aSupportedNetworkAdapterTypes.assign(aNetworkAdapterTypes + 1 /* Don't include _Null */,

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -1698 +1698 @@
         case NetworkAdapterType_ELNK1:
             return "3c501";
+        case NetworkAdapterType_UsbNet:
+            return "usbnet";
         default:
             AssertFailed();
@@ -4353 +4355 @@
 
                     PPDMIBASE pBase = NULL;
-                    int vrc = ptrVM.vtable()->pfnPDMR3QueryDeviceLun(ptrVM.rawUVM(), pszAdapterName, ulInstance, 0, &pBase);
+                    int vrc = VINF_SUCCESS;
+                    if (adapterType == NetworkAdapterType_UsbNet)
+                        vrc = ptrVM.vtable()->pfnPDMR3UsbQueryLun(ptrVM.rawUVM(), pszAdapterName, ulInstance, 0, &pBase);
+                    else
+                        vrc = ptrVM.vtable()->pfnPDMR3QueryDeviceLun(ptrVM.rawUVM(), pszAdapterName, ulInstance, 0, &pBase);
+                    if (RT_FAILURE(vrc))
                     if (RT_SUCCESS(vrc))
                     {

trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp

@@ -919 +919 @@
         std::list<BootNic> llBootNics;
         vrc = i_configNetworkCtrls(pMachine, pPlatformProperties, chipsetType, pBusMgr,
-                                   pVMM, pUVM, pDevices, llBootNics);                            VRC();
+                                   pVMM, pUVM, pDevices, pUsbDevices, llBootNics);               VRC();
 
         /*

trunk/src/VBox/Main/src-client/ConsoleImplConfigCommon.cpp

@@ -4646 +4646 @@
 int Console::i_configNetworkCtrls(ComPtr<IMachine> pMachine, ComPtr<IPlatformProperties> pPlatformProperties,
                                   ChipsetType_T enmChipset, BusAssignmentManager *pBusMgr, PCVMMR3VTABLE pVMM, PUVM pUVM,
-                                  PCFGMNODE pDevices, std::list<BootNic> &llBootNics)
+                                  PCFGMNODE pDevices, PCFGMNODE pUsbDevices, std::list<BootNic> &llBootNics)
 {
 /* Comment out the following line to remove VMWare compatibility hack. */
@@ -4676 +4676 @@
     PCFGMNODE pDev3C501 = NULL;          /* EtherLink-type devices */
     InsertConfigNode(pDevices, "3c501",  &pDev3C501);
+    PCFGMNODE pUsbNet = NULL;            /* USB NCM Ethernet devices */
 
     for (ULONG uInstance = 0; uInstance < maxNetworkAdapters; ++uInstance)
@@ -4723 +4724 @@
                 pDev = pDev3C501;
                 break;
+            case NetworkAdapterType_UsbNet:
+                if (!pUsbNet)
+                    InsertConfigNode(pUsbDevices, "UsbNet",  &pUsbNet);
+                pDev = pUsbNet;
+                pszAdapterName = "UsbNet";
+                break;
             default:
                 AssertMsgFailed(("Invalid network adapter type '%d' for slot '%d'", adapterType, uInstance));
@@ -4730 +4737 @@
 
         InsertConfigNode(pDev, Utf8StrFmt("%u", uInstance).c_str(), &pInst);
+        /* USB Ethernet is not attached to PCI bus, skip irrelevant bits. */
+        if (adapterType != NetworkAdapterType_UsbNet)
+        {
         InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
 
@@ -4834 +4844 @@
             case NetworkAdapterType_ELNK1:
                 break;
+            case NetworkAdapterType_UsbNet:    /* fall through */
             case NetworkAdapterType_Null:      AssertFailedBreak(); /* (compiler warnings) */
 #ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK
@@ -4839 +4850 @@
 #endif
         }
+        }
+        else
+            InsertConfigNode(pInst, "Config", &pCfg);
 
         /*
@@ -4884 +4898 @@
         InsertConfigInteger(pCfg, "CableConnected", fCableConnected ? 1 : 0);
 
+        /* No line speed for USB Ethernet. */
+        if (adapterType != NetworkAdapterType_UsbNet)
+        {
         /*
          * Line speed to report from custom drivers
@@ -4890 +4907 @@
         hrc = networkAdapter->COMGETTER(LineSpeed)(&ulLineSpeed);                       H();
         InsertConfigInteger(pCfg, "LineSpeed", ulLineSpeed);
+        }
 
         /*

trunk/src/VBox/Main/src-client/ConsoleImplConfigX86.cpp

@@ -1694 +1694 @@
         std::list<BootNic> llBootNics;
         vrc = i_configNetworkCtrls(pMachine, platformProperties, chipsetType, pBusMgr,
-                                   pVMM, pUVM, pDevices, llBootNics);                        VRC();
+                                   pVMM, pUVM, pDevices, pUsbDevices, llBootNics);           VRC();
 
         /*

trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp

@@ -268 +268 @@
         case NetworkAdapterType_ELNK2:
         case NetworkAdapterType_ELNK1:
+        case NetworkAdapterType_UsbNet:
             break;
         default:

trunk/src/VBox/Main/xml/Settings.cpp

@@ -4691 +4691 @@
             else if (strTemp == "3C501")
                 nic.type = NetworkAdapterType_ELNK1;
+            else if (strTemp == "usbnet")
+                nic.type = NetworkAdapterType_UsbNet;
             else
                 throw ConfigFileError(this, pelmAdapter, N_("Invalid value '%s' in Adapter/@type attribute"), strTemp.c_str());
@@ -8106 +8108 @@
                         case NetworkAdapterType_ELNK2:      pcszType = "3C503"; break;
                         case NetworkAdapterType_ELNK1:      pcszType = "3C501"; break;
+                        case NetworkAdapterType_UsbNet:     pcszType = "usbnet"; break;
                         default: /*case NetworkAdapterType_Am79C970A:*/  pcszType = "Am79C970A"; break;
                     }