Skip to content

Commit 76b357c

Browse files
committed
Do not activate sparse memory by default for c1700 and c2600 platforms.
GNS3/dynamips#54
1 parent 80ab811 commit 76b357c

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

gns3server/modules/dynamips/backends/vm.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ def vm_create(self, request):
158158
router = PLATFORMS[platform](hypervisor, name, router_id)
159159
router.ram = ram
160160
router.image = image
161-
router.sparsemem = self._hypervisor_manager.sparse_memory_support
161+
if platform not in ("c1700", "c2600"):
162+
router.sparsemem = self._hypervisor_manager.sparse_memory_support
162163
router.mmap = self._hypervisor_manager.mmap_support
163164
if "console" in request:
164165
router.console = request["console"]

gns3server/modules/dynamips/nodes/c1700.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def __init__(self, hypervisor, name, router_id=None, chassis="1720"):
5151
self._chassis = chassis
5252
self._iomem = 15 # percentage
5353
self._clock_divisor = 8
54+
self._sparsemem = False
5455

5556
if chassis != "1720":
5657
self.chassis = chassis
@@ -72,7 +73,8 @@ def defaults(self):
7273
"disk1": self._disk1,
7374
"chassis": self._chassis,
7475
"iomem": self._iomem,
75-
"clock_divisor": self._clock_divisor}
76+
"clock_divisor": self._clock_divisor,
77+
"sparsemem": self._sparsemem}
7678

7779
# update the router defaults with the platform specific defaults
7880
router_defaults.update(platform_defaults)

gns3server/modules/dynamips/nodes/c2600.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ def __init__(self, hypervisor, name, router_id=None, chassis="2610"):
6666
self._chassis = chassis
6767
self._iomem = 15 # percentage
6868
self._clock_divisor = 8
69+
self._sparsemem = False
6970

7071
if chassis != "2610":
7172
self.chassis = chassis
@@ -87,7 +88,8 @@ def defaults(self):
8788
"disk1": self._disk1,
8889
"iomem": self._iomem,
8990
"chassis": self._chassis,
90-
"clock_divisor": self._clock_divisor}
91+
"clock_divisor": self._clock_divisor,
92+
"sparsemem": self._sparsemem}
9193

9294
# update the router defaults with the platform specific defaults
9395
router_defaults.update(platform_defaults)

0 commit comments

Comments
 (0)