derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: update linux boot tests

Browse Source 
This change updates the config scripts used by linux boot
tests to make them compatible with change that deprecated
LinuxX86System

JIRA: https://gem5.atlassian.net/browse/GEM5-440

Change-Id: I04beff2915c03a2c3a774351edbba60d7ff26867
Signed-off-by: Ayaz Akram <yazakram@ucdavis.edu>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28427
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Ayaz Akram
2020-05-01 00:14:35 -07:00
parent 2848288097
commit 63d57fd861
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/gem5/x86-boot-tests/run_exit.py
View File

@@ -51,7 +51,7 @@ system = MySystem(args.kernel, args.disk, args.cpu_type, args.num_cpus)
if args.boot_type == "init":
# Simply run "exit.sh"
system.boot_osflags += ' init=/root/exit.sh'
system.workload.command_line += ' init=/root/exit.sh'
else:
if args.boot_type != "systemd":
m5.fatal("Bad option for boot_type. init or systemd.")

15
tests/gem5/x86-boot-tests/system/system.py
View File

@@ -30,11 +30,12 @@ from m5.util import convert
from caches import *
import sys
class MySystem(LinuxX86System):
class MySystem(System):
def __init__(self, kernel, disk, cpu_type, num_cpus):
super(MySystem, self).__init__()
self.workload = X86FsLinux()
self._host_parallel = cpu_type == "kvm"
# Set up the clock domain and the voltage domain
@@ -63,12 +64,12 @@ class MySystem(LinuxX86System):
self.setDiskImages(disk, disk)
# Change this path to point to the kernel you want to use
self.kernel = kernel
self.workload.object_file = kernel
# Options specified on the kernel command line
boot_options = ['earlyprintk=ttyS0', 'console=ttyS0', 'lpj=7999923',
'root=/dev/hda1']
self.boot_osflags = ' '.join(boot_options)
self.workload.command_line = ' '.join(boot_options)
# Create the CPUs for our system.
self.createCPU(cpu_type, num_cpus)
@@ -235,7 +236,7 @@ class MySystem(LinuxX86System):
###############################################
# Add in a Bios information structure.
self.smbios_table.structures = [X86SMBiosBiosInformation()]
self.workload.smbios_table.structures = [X86SMBiosBiosInformation()]
# Set up the Intel MP table
base_entries = []
@@ -293,8 +294,8 @@ class MySystem(LinuxX86System):
assignISAInt(1, 1)
for i in range(3, 15):
assignISAInt(i, i)
self.intel_mp_table.base_entries = base_entries
self.intel_mp_table.ext_entries = ext_entries
self.workload.intel_mp_table.base_entries = base_entries
self.workload.intel_mp_table.ext_entries = ext_entries
entries = \
[
@@ -311,7 +312,7 @@ class MySystem(LinuxX86System):
entries.append(X86E820Entry(addr = 0xFFFF0000, size = '64kB',
range_type=2))
self.e820_table.entries = entries
self.workload.e820_table.entries = entries
class CowDisk(IdeDisk):
def __init__(self, filename):