This commit is contained in:
Ciro Santilli 六四事件 法轮功
2020-11-20 00:00:00 +00:00
parent 367df352d3
commit 2abb994752
9 changed files with 163 additions and 22 deletions

16
run
View File

@@ -600,6 +600,8 @@ Extra options to append at the end of the emulator command line.
])
if use_disk_image:
cmd.extend(['--disk-image', self.env['disk_image'], LF])
if os.path.exists(self.env['disk_image_2']):
cmd.extend(['--disk-image', self.env['disk_image_2'], LF])
if self.env['baremetal']:
cmd.extend([
'--param', 'system.workload.extras = "{}"'.format(self.python_escape_double_quotes(baremetal_cli_path)), LF,
@@ -677,6 +679,8 @@ Extra options to append at the end of the emulator command line.
])
if use_disk_image:
cmd.extend(['--disk', self.env['disk_image'], LF])
if os.path.exists(self.env['disk_image_2']):
cmd.extend(['--disk', self.env['disk_image_2'], LF])
if self.env['dtb']:
cmd.extend([
'--dtb',
@@ -844,6 +848,18 @@ Extra options to append at the end of the emulator command line.
),
LF,
])
if os.path.exists(self.env['disk_image_2']):
extra_emulator_args.extend([
'-drive',
'file={},format={},if={}{}{}'.format(
self.env['disk_image_2'],
'raw',
driveif,
snapshot,
rrid
),
LF,
])
if rr:
extra_emulator_args.extend([
'-object', 'filter-replay,id=replay,netdev=net0', LF,