3rd-party/linux-kernel-module-cheat
1
0
Fork 0
mirror of https://github.com/cirosantilli/linux-kernel-module-cheat.git synced 2026-01-22 17:55:57 +01:00
Code Issues Releases Wiki Activity

Don't pass dummy disk images to gem5

Browse Source 
After https://gem5.atlassian.net/browse/GEM5-337:

- gem5 baremetal can run without any disk images, just like QEMU
- gem5 X86 can run with a single disk image and no horrendous dummy vmlinux
  and second disk image
This commit is contained in:
Ciro Santilli 六四事件 法轮功
2020-02-14 00:00:00 +00:00
parent 17fba4a968
commit f2713e69f6
3 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
run
View File

@@ -471,11 +471,7 @@ Extra options to append at the end of the emulator command line.
if self.env['emulator'] == 'gem5':
if self.env['quiet']:
show_stdout = False
if not self.env['baremetal'] is None:
if not os.path.exists(self.env['gem5_fake_iso']):
os.makedirs(os.path.dirname(self.env['gem5_fake_iso']), exist_ok=True)
self.sh.write_string_to_file(self.env['gem5_fake_iso'], 'a' * 512)
elif self.env['userland'] is None:
if self.env['baremetal'] is None and self.env['userland'] is None:
if not os.path.exists(self.env['rootfs_raw_file']):
if not os.path.exists(self.env['qcow2_file']):
raise_rootfs_not_found()
@@ -536,11 +532,12 @@ Extra options to append at the end of the emulator command line.
extra_emulator_args.extend(['-r', str(cpt_dirs_sorted_by_tick.index(cpt_dir) + 1)])
cmd.extend([
self.env['gem5_fs_file'], LF,
'--disk-image', self.env['disk_image'], LF,
'--kernel', self.env['image'], LF,
'--num-cpus', str(self.env['cpus']), LF,
'--script', self.env['gem5_readfile_file'], LF,
])
if self.env['disk_image'] is not None:
cmd.extend(['--disk-image', self.env['disk_image'], LF])
if self.env['arch'] == 'x86_64':
if self.env['kvm']:
cmd.extend(['--cpu-type', 'X86KvmCPU', LF])
@@ -608,11 +605,12 @@ Extra options to append at the end of the emulator command line.
'--bootscript', self.env['gem5_readfile_file'], LF,
'--big-cpus', str((self.env['cpus'] + 1) // 2), LF,
'--cpu-type', cpu_type, LF,
'--disk', self.env['disk_image'], LF,
'--kernel', self.env['image'], LF,
'--little-cpus', str(self.env['cpus'] // 2), LF,
'--root', '/dev/vda', LF,
])
if self.env['disk_image'] is not None:
cmd.extend(['--disk', self.env['disk_image'], LF])
if self.env['dtb']:
cmd.extend([
'--dtb',
@@ -749,6 +747,12 @@ Extra options to append at the end of the emulator command line.
if not os.path.exists(self.env['rootfs_raw_file']):
raise_rootfs_not_found()
self.raw_to_qcow2(qemu_which=self.env['qemu_which'])
if rr:
extra_emulator_args.extend([
'-drive', 'driver=blkreplay,if=none,image=img-direct,id=img-blkreplay', LF,
'-device', 'ide-hd,drive=img-blkreplay', LF,
])
if self.env['disk_image'] is not None:
extra_emulator_args.extend([
'-drive',
'file={},format=qcow2,if={}{}{}'.format(
@@ -759,11 +763,6 @@ Extra options to append at the end of the emulator command line.
),
LF,
])
if rr:
extra_emulator_args.extend([
'-drive', 'driver=blkreplay,if=none,image=img-direct,id=img-blkreplay', LF,
'-device', 'ide-hd,drive=img-blkreplay', LF,
])
if rr:
extra_emulator_args.extend([
'-object', 'filter-replay,id=replay,netdev=net0', LF,