Changeset 107267 in vbox for trunk/src/VBox/Main/src-client
- Timestamp:
- Dec 10, 2024 7:37:35 AM (3 months ago)
- svn:sync-xref-src-repo-rev:
- 166288
- Location:
- trunk/src/VBox/Main/src-client
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
r107116 r107267 1698 1698 case NetworkAdapterType_ELNK1: 1699 1699 return "3c501"; 1700 case NetworkAdapterType_UsbNet: 1701 return "usbnet"; 1700 1702 default: 1701 1703 AssertFailed(); … … 4353 4355 4354 4356 PPDMIBASE pBase = NULL; 4355 int vrc = ptrVM.vtable()->pfnPDMR3QueryDeviceLun(ptrVM.rawUVM(), pszAdapterName, ulInstance, 0, &pBase); 4357 int vrc = VINF_SUCCESS; 4358 if (adapterType == NetworkAdapterType_UsbNet) 4359 vrc = ptrVM.vtable()->pfnPDMR3UsbQueryLun(ptrVM.rawUVM(), pszAdapterName, ulInstance, 0, &pBase); 4360 else 4361 vrc = ptrVM.vtable()->pfnPDMR3QueryDeviceLun(ptrVM.rawUVM(), pszAdapterName, ulInstance, 0, &pBase); 4362 if (RT_FAILURE(vrc)) 4356 4363 if (RT_SUCCESS(vrc)) 4357 4364 { -
trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp
r107168 r107267 919 919 std::list<BootNic> llBootNics; 920 920 vrc = i_configNetworkCtrls(pMachine, pPlatformProperties, chipsetType, pBusMgr, 921 pVMM, pUVM, pDevices, llBootNics);VRC();921 pVMM, pUVM, pDevices, pUsbDevices, llBootNics); VRC(); 922 922 923 923 /* -
trunk/src/VBox/Main/src-client/ConsoleImplConfigCommon.cpp
r106960 r107267 4646 4646 int Console::i_configNetworkCtrls(ComPtr<IMachine> pMachine, ComPtr<IPlatformProperties> pPlatformProperties, 4647 4647 ChipsetType_T enmChipset, BusAssignmentManager *pBusMgr, PCVMMR3VTABLE pVMM, PUVM pUVM, 4648 PCFGMNODE pDevices, std::list<BootNic> &llBootNics)4648 PCFGMNODE pDevices, PCFGMNODE pUsbDevices, std::list<BootNic> &llBootNics) 4649 4649 { 4650 4650 /* Comment out the following line to remove VMWare compatibility hack. */ … … 4676 4676 PCFGMNODE pDev3C501 = NULL; /* EtherLink-type devices */ 4677 4677 InsertConfigNode(pDevices, "3c501", &pDev3C501); 4678 PCFGMNODE pUsbNet = NULL; /* USB NCM Ethernet devices */ 4678 4679 4679 4680 for (ULONG uInstance = 0; uInstance < maxNetworkAdapters; ++uInstance) … … 4723 4724 pDev = pDev3C501; 4724 4725 break; 4726 case NetworkAdapterType_UsbNet: 4727 if (!pUsbNet) 4728 InsertConfigNode(pUsbDevices, "UsbNet", &pUsbNet); 4729 pDev = pUsbNet; 4730 pszAdapterName = "UsbNet"; 4731 break; 4725 4732 default: 4726 4733 AssertMsgFailed(("Invalid network adapter type '%d' for slot '%d'", adapterType, uInstance)); … … 4730 4737 4731 4738 InsertConfigNode(pDev, Utf8StrFmt("%u", uInstance).c_str(), &pInst); 4739 /* USB Ethernet is not attached to PCI bus, skip irrelevant bits. */ 4740 if (adapterType != NetworkAdapterType_UsbNet) 4741 { 4732 4742 InsertConfigInteger(pInst, "Trusted", 1); /* boolean */ 4733 4743 … … 4834 4844 case NetworkAdapterType_ELNK1: 4835 4845 break; 4846 case NetworkAdapterType_UsbNet: /* fall through */ 4836 4847 case NetworkAdapterType_Null: AssertFailedBreak(); /* (compiler warnings) */ 4837 4848 #ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK … … 4839 4850 #endif 4840 4851 } 4852 } 4853 else 4854 InsertConfigNode(pInst, "Config", &pCfg); 4841 4855 4842 4856 /* … … 4884 4898 InsertConfigInteger(pCfg, "CableConnected", fCableConnected ? 1 : 0); 4885 4899 4900 /* No line speed for USB Ethernet. */ 4901 if (adapterType != NetworkAdapterType_UsbNet) 4902 { 4886 4903 /* 4887 4904 * Line speed to report from custom drivers … … 4890 4907 hrc = networkAdapter->COMGETTER(LineSpeed)(&ulLineSpeed); H(); 4891 4908 InsertConfigInteger(pCfg, "LineSpeed", ulLineSpeed); 4909 } 4892 4910 4893 4911 /* -
trunk/src/VBox/Main/src-client/ConsoleImplConfigX86.cpp
r107139 r107267 1694 1694 std::list<BootNic> llBootNics; 1695 1695 vrc = i_configNetworkCtrls(pMachine, platformProperties, chipsetType, pBusMgr, 1696 pVMM, pUVM, pDevices, llBootNics);VRC();1696 pVMM, pUVM, pDevices, pUsbDevices, llBootNics); VRC(); 1697 1697 1698 1698 /*
Note:
See TracChangeset
for help on using the changeset viewer.