73a74,84
> def cmd_line_template():
> if options.command_line and options.command_line_file:
> print "Error: --command-line and --command-line-file are " \
> "mutually exclusive"
> sys.exit(1)
> if options.command_line:
> return options.command_line
> if options.command_line_file:
> return open(options.command_line_file).read().strip()
> return None
>
74a86
> cmdline = cmd_line_template()
76c88,89
< test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0], options.ruby)
---
> test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0], options.ruby,
> cmdline=cmdline)
78c91
< test_sys = makeLinuxMipsSystem(test_mem_mode, bm[0])
---
> test_sys = makeLinuxMipsSystem(test_mem_mode, bm[0], cmdline=cmdline)
80c93
< test_sys = makeSparcSystem(test_mem_mode, bm[0])
---
> test_sys = makeSparcSystem(test_mem_mode, bm[0], cmdline=cmdline)
83c96
< options.ruby)
---
> options.ruby, cmdline=cmdline)
87c100,101
< bare_metal=options.bare_metal)
---
> bare_metal=options.bare_metal,
> cmdline=cmdline)
204a219
> cmdline = cmd_line_template()
206c221
< drive_sys = makeLinuxAlphaSystem(drive_mem_mode, bm[1])
---
> drive_sys = makeLinuxAlphaSystem(drive_mem_mode, bm[1], cmdline=cmdline)
208c223
< drive_sys = makeLinuxMipsSystem(drive_mem_mode, bm[1])
---
> drive_sys = makeLinuxMipsSystem(drive_mem_mode, bm[1], cmdline=cmdline)
210c225
< drive_sys = makeSparcSystem(drive_mem_mode, bm[1])
---
> drive_sys = makeSparcSystem(drive_mem_mode, bm[1], cmdline=cmdline)
212c227,228
< drive_sys = makeLinuxX86System(drive_mem_mode, np, bm[1])
---
> drive_sys = makeLinuxX86System(drive_mem_mode, np, bm[1],
> cmdline=cmdline)
214c230,231
< drive_sys = makeArmSystem(drive_mem_mode, options.machine_type, bm[1])
---
> drive_sys = makeArmSystem(drive_mem_mode, options.machine_type, bm[1],
> cmdline=cmdline)