NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-06 07:11:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2' into 3.0

Browse Source 
# Conflicts:
#	gns3server/compute/base_node.py
#	gns3server/compute/docker/__init__.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/virtualbox_gns3_vm.py
#	gns3server/controller/node.py
#	gns3server/controller/project.py
#	gns3server/crash_report.py
#	gns3server/handlers/api/controller/template_handler.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.8448c96e4facbe79a613.js
#	gns3server/version.py
#	tests/compute/iou/test_iou_vm.py
#	tests/compute/qemu/test_qemu_vm.py
#	tests/handlers/api/controller/test_template.py
This commit is contained in:
grossmj committed 2023-06-20 16:06:53 +09:30
2 parents 8cc0244c5a 3dbc714f37
commit 1ff23348d3
23 files changed
+763 -138
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/compute/qemu/qemu_vm.py
+2
View File
@@ -2374,6 +2374,8 @@ class QemuVM(BaseNode):
mac = int_to_macaddress(macaddress_to_int(custom_mac_address))
device_string = f"{adapter_type},mac={mac}"
if adapter_type == "virtio-net-pci":
device_string = "{},speed=10000,duplex=full".format(device_string)
bridge_id = math.floor(pci_device_id / 32)
if bridge_id > 0:
if pci_bridges_created < bridge_id: