arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
grossmj 2019-03-18 19:26:46 +07:00
commit e00bde51da
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gns3server/controller/gns3vm/vmware_gns3_vm.py
View File

@ -69,15 +69,16 @@ class VMwareGNS3VM(BaseGNS3VM):
if ram % 4 != 0: if ram % 4 != 0:
raise GNS3VMError("Allocated memory {} for the GNS3 VM must be a multiple of 4".format(ram)) raise GNS3VMError("Allocated memory {} for the GNS3 VM must be a multiple of 4".format(ram))
available_vcpus = psutil.cpu_count() available_vcpus = psutil.cpu_count(logical=True)
if vcpus > available_vcpus: if vcpus > available_vcpus:
raise GNS3VMError("You have allocated too many vCPUs for the GNS3 VM! (max available is {} vCPUs)".format(available_vcpus)) raise GNS3VMError("You have allocated too many vCPUs for the GNS3 VM! (max available is {} vCPUs)".format(available_vcpus))
try: try:
pairs = VMware.parse_vmware_file(self._vmx_path) pairs = VMware.parse_vmware_file(self._vmx_path)
if vcpus > 1:
pairs["numvcpus"] = str(vcpus) pairs["numvcpus"] = str(vcpus)
cores_per_sockets = int(available_vcpus / psutil.cpu_count(logical=False)) cores_per_sockets = int(vcpus / psutil.cpu_count(logical=False))
if cores_per_sockets >= 1: if cores_per_sockets > 1:
pairs["cpuid.corespersocket"] = str(cores_per_sockets) pairs["cpuid.corespersocket"] = str(cores_per_sockets)
pairs["memsize"] = str(ram) pairs["memsize"] = str(ram)
VMware.write_vmx_file(self._vmx_path, pairs) VMware.write_vmx_file(self._vmx_path, pairs)