configs,tests: Update refs to deprecated 'x86-ubuntu-img'

This resource has been deprecated in favor of 'x86-ubuntu-18.04-img'. In
practise, these are the same resource (i.e., the same disk image), but
we deprecate 'x86-ubuntu-img' as 'x86-ubuntu-18.04-img' is more explicit
on what the disk image contains. Going forward we may want different
disk image resources with different Ubuntu versions, and we want it to
be clear what the user is retrieving.

Change-Id: I06b08e6b65cf431067ffda35ebd10d419068d073
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/54583
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Bobby R. Bruce
2021-12-19 18:20:33 -08:00
committed by Bobby Bruce
parent c999905772
commit 5cf00e5055
5 changed files with 5 additions and 5 deletions

View File

@@ -121,7 +121,7 @@ board.set_kernel_disk_workload(
kernel=Resource("x86-linux-kernel-5.4.49"),
# The x86 ubuntu image will be automatically downloaded to the if not
# already present.
disk_image=Resource("x86-ubuntu-img"),
disk_image=Resource("x86-ubuntu-18.04-img"),
readfile_contents=command,
)

View File

@@ -58,7 +58,7 @@ board = X86DemoBoard()
# downloaded.
board.set_kernel_disk_workload(
kernel=Resource("x86-linux-kernel-5.4.49"),
disk_image=Resource("x86-ubuntu-img"),
disk_image=Resource("x86-ubuntu-18.04-img"),
)
simulator = Simulator(board=board)

View File

@@ -203,7 +203,7 @@ motherboard.set_kernel_disk_workload(
resource_directory=args.resource_directory,
),
disk_image=Resource(
"x86-ubuntu-img",
"x86-ubuntu-18.04-img",
resource_directory=args.resource_directory,
),
readfile_contents=dedent(

View File

@@ -188,7 +188,7 @@ motherboard.set_kernel_disk_workload(
resource_directory=args.resource_directory,
),
disk_image=Resource(
"x86-ubuntu-img",
"x86-ubuntu-18.04-img",
resource_directory=args.resource_directory,
),
# The first exit signals to switch processors.

View File

@@ -207,7 +207,7 @@ motherboard.set_kernel_disk_workload(
resource_directory=args.resource_directory,
),
disk_image=Resource(
"x86-ubuntu-img",
"x86-ubuntu-18.04-img",
resource_directory=args.resource_directory,
),
kernel_args=kernal_args,