stdlib,tests: Fix boot_kvm_fork_run.py

The patch
https://gem5-review.googlesource.com/c/public/gem5/+/51949
changed the way in which kernel arguments were passed to the
'set_kernel_disk_workload' function. The 'kernel_args' parameter
overrides the kernel arguments, not amends them as before. This test
script was not updated to take into account this functionality, and, as
such, the test failed. This patch fixes this.

Change-Id: I737c59329acde3a064f933bc4d31e20cf6ca55ae
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52663
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
This commit is contained in:
Bobby R. Bruce
2021-11-10 14:39:30 -08:00
parent 97565ecf6c
commit c73e6e78a8

View File

@@ -194,6 +194,8 @@ motherboard = X86Board(
cache_hierarchy=cache_hierarchy,
)
kernel_args = motherboard.get_default_kernel_args() + [args.kernel_args]
# Set the Full System workload.
motherboard.set_kernel_disk_workload(
kernel=Resource(
@@ -210,7 +212,7 @@ motherboard.set_kernel_disk_workload(
m5 exit # exit in children and parent
"""
),
kernel_args=[args.kernel_args]
kernel_args=kernel_args
)