diff --git a/run b/run index 304705d..e9f19c1 100755 --- a/run +++ b/run @@ -206,7 +206,7 @@ See: http://github.com/cirosantilli/linux-kernel-module-cheat#kvm '--memory', default='256M', help='''\ -Set the memory size of the guest. E.g.: `-m 512M`. We try to keep the default +Set the memory size of the guest. E.g.: `--memory 512M`. We try to keep the default at the minimal ammount amount that boots all archs. Anything lower could lead some arch to fail to boot. Default: %(default)s @@ -504,7 +504,6 @@ Extra options to append at the end of the emulator command line. self.env['gem5_fs_file'], LF, '--disk-image', self.env['disk_image'], LF, '--kernel', self.env['image'], LF, - '--mem-size', memory, LF, '--num-cpus', str(self.env['cpus']), LF, '--script', self.env['gem5_readfile_file'], LF, ]) @@ -590,6 +589,7 @@ Extra options to append at the end of the emulator command line. ), LF ]) + cmd.extend(['--mem-size', memory, LF]) if self.env['gdb_wait']: # https://stackoverflow.com/questions/49296092/how-to-make-gem5-wait-for-gdb-to-connect-to-reliably-break-at-start-kernel-of-th cmd.extend(['--param', 'system.cpu[0].wait_for_remote_gdb = True', LF])