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

Do not activate sparse memory by default for c1700 and c2600 platforms.

Browse Source 
https://github.com/GNS3/dynamips/issues/54
This commit is contained in:
grossmj 2014-08-26 17:07:48 -06:00
parent 80ab81190c
commit 76b357c1ce
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/modules/dynamips/backends/vm.py
View File

@ -158,7 +158,8 @@ class VM(object):
router = PLATFORMS[platform](hypervisor, name, router_id) router = PLATFORMS[platform](hypervisor, name, router_id)
router.ram = ram router.ram = ram
router.image = image router.image = image
router.sparsemem = self._hypervisor_manager.sparse_memory_support if platform not in ("c1700", "c2600"):
router.sparsemem = self._hypervisor_manager.sparse_memory_support
router.mmap = self._hypervisor_manager.mmap_support router.mmap = self._hypervisor_manager.mmap_support
if "console" in request: if "console" in request:
router.console = request["console"] router.console = request["console"]

4
gns3server/modules/dynamips/nodes/c1700.py
View File

@ -51,6 +51,7 @@ class C1700(Router):
self._chassis = chassis self._chassis = chassis
self._iomem = 15 # percentage self._iomem = 15 # percentage
self._clock_divisor = 8 self._clock_divisor = 8
self._sparsemem = False
if chassis != "1720": if chassis != "1720":
self.chassis = chassis self.chassis = chassis
@ -72,7 +73,8 @@ class C1700(Router):
"disk1": self._disk1, "disk1": self._disk1,
"chassis": self._chassis, "chassis": self._chassis,
"iomem": self._iomem, "iomem": self._iomem,
"clock_divisor": self._clock_divisor} "clock_divisor": self._clock_divisor,
"sparsemem": self._sparsemem}
# update the router defaults with the platform specific defaults # update the router defaults with the platform specific defaults
router_defaults.update(platform_defaults) router_defaults.update(platform_defaults)

4
gns3server/modules/dynamips/nodes/c2600.py
View File

@ -66,6 +66,7 @@ class C2600(Router):
self._chassis = chassis self._chassis = chassis
self._iomem = 15 # percentage self._iomem = 15 # percentage
self._clock_divisor = 8 self._clock_divisor = 8
self._sparsemem = False
if chassis != "2610": if chassis != "2610":
self.chassis = chassis self.chassis = chassis
@ -87,7 +88,8 @@ class C2600(Router):
"disk1": self._disk1, "disk1": self._disk1,
"iomem": self._iomem, "iomem": self._iomem,
"chassis": self._chassis, "chassis": self._chassis,
"clock_divisor": self._clock_divisor} "clock_divisor": self._clock_divisor,
"sparsemem": self._sparsemem}
# update the router defaults with the platform specific defaults # update the router defaults with the platform specific defaults
router_defaults.update(platform_defaults) router_defaults.update(platform_defaults)