Ayaz Akram has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/28427 )
Change subject: tests: update linux boot tests
......................................................................
tests: update linux boot tests
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 <yazak...@ucdavis.edu>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28427
Maintainer: Bobby R. Bruce <bbr...@ucdavis.edu>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M tests/gem5/x86-boot-tests/run_exit.py
M tests/gem5/x86-boot-tests/system/system.py
2 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/tests/gem5/x86-boot-tests/run_exit.py
b/tests/gem5/x86-boot-tests/run_exit.py
index 24edcc5..ecb3a84 100644
--- a/tests/gem5/x86-boot-tests/run_exit.py
+++ b/tests/gem5/x86-boot-tests/run_exit.py
@@ -51,7 +51,7 @@
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.")
diff --git a/tests/gem5/x86-boot-tests/system/system.py
b/tests/gem5/x86-boot-tests/system/system.py
index 0b69be9..c55664e 100755
--- a/tests/gem5/x86-boot-tests/system/system.py
+++ b/tests/gem5/x86-boot-tests/system/system.py
@@ -30,11 +30,12 @@
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 @@
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 @@
###############################################
# 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 @@
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 @@
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):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/28427
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I04beff2915c03a2c3a774351edbba60d7ff26867
Gerrit-Change-Number: 28427
Gerrit-PatchSet: 3
Gerrit-Owner: Ayaz Akram <yazak...@ucdavis.edu>
Gerrit-Reviewer: Ayaz Akram <yazak...@ucdavis.edu>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
